commit push and run

This commit is contained in:
00asdf 2023-04-18 18:54:23 +02:00
parent e49993f88a
commit 6c5b1b899e
8 changed files with 258 additions and 53 deletions

3
.gitignore vendored
View File

@ -28,4 +28,5 @@ bin/
### Mac OS ### ### Mac OS ###
.DS_Store .DS_Store
.idea .idea/workspace.xml
.idea/shelf/

6
.idea/misc.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="17" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>

8
.idea/modules.xml Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/GeneralUtils.iml" filepath="$PROJECT_DIR$/GeneralUtils.iml" />
</modules>
</component>
</project>

124
.idea/uiDesigner.xml Normal file
View File

@ -0,0 +1,124 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Palette2">
<group name="Swing">
<item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
</item>
<item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
</item>
<item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
</item>
<item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.svg" removable="false" auto-create-binding="false" can-attach-label="true">
<default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
</item>
<item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
<initial-values>
<property name="text" value="Button" />
</initial-values>
</item>
<item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
<initial-values>
<property name="text" value="RadioButton" />
</initial-values>
</item>
<item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
<initial-values>
<property name="text" value="CheckBox" />
</initial-values>
</item>
<item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
<initial-values>
<property name="text" value="Label" />
</initial-values>
</item>
<item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
</item>
<item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
<preferred-size width="200" height="200" />
</default-constraints>
</item>
<item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
<preferred-size width="200" height="200" />
</default-constraints>
</item>
<item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
</item>
<item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
</item>
<item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
</item>
<item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
</item>
<item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
<preferred-size width="-1" height="20" />
</default-constraints>
</item>
<item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
</item>
<item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
</item>
</group>
</component>
</project>

6
.idea/vcs.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>

View File

@ -5,13 +5,9 @@ import dev.asdf00.general.utils.list.internal.ByteList;
public abstract class PrimitiveList<T> extends AbstractBaseList<T> { public abstract class PrimitiveList<T> extends AbstractBaseList<T> {
public static <T> PrimitiveList<T> create(Class<T> type) { public static <T> PrimitiveList<T> create(Class<T> boxedType) {
return create(type, 8);
}
public static <T> PrimitiveList<T> create(Class<T> boxedType, int initial) {
if (Byte.class == boxedType) { if (Byte.class == boxedType) {
return (PrimitiveList<T>) new ByteList(initial); return (PrimitiveList<T>) new ByteList();
} else if (Short.class.equals(boxedType)) { } else if (Short.class.equals(boxedType)) {
return null; return null;
} else if (Integer.class.equals(boxedType)) { } else if (Integer.class.equals(boxedType)) {

View File

@ -65,12 +65,6 @@ public abstract class AbstractBaseList<T> implements List<T> {
return true; return true;
} }
@Override
public T remove(int index) {
Objects.checkIndex(index, size);
return remove(index, 0, size);
}
@Override @Override
public boolean remove(Object o) { public boolean remove(Object o) {
int index = indexOf(o); int index = indexOf(o);
@ -149,15 +143,15 @@ public abstract class AbstractBaseList<T> implements List<T> {
protected abstract <T1> T1[] toArray(T1[] a, int start, int len); protected abstract <T1> T1[] toArray(T1[] a, int start, int len);
protected abstract T remove(Object o, int start, int len);
protected abstract int indexOf(Object o, int start, int len); protected abstract int indexOf(Object o, int start, int len);
protected abstract int lastIndexOf(Object o, int start, int len); protected abstract int lastIndexOf(Object o, int start, int len);
protected abstract T directSet(int index, T element); protected abstract T directSet(int index, T element);
protected abstract void removeRange(int start, int len); protected abstract void createGap(int start, int len);
protected abstract void closeGap(int start, int len);
private static class ListItr<E> implements ListIterator<E> { private static class ListItr<E> implements ListIterator<E> {
@ -291,7 +285,7 @@ public abstract class AbstractBaseList<T> implements List<T> {
public void clear() { public void clear() {
checkConcurrentModification(); checkConcurrentModification();
modCnt++; modCnt++;
base.removeRange(start, size); base.closeGap(start, size);
size = 0; size = 0;
} }
@ -310,6 +304,11 @@ public abstract class AbstractBaseList<T> implements List<T> {
base.add(start + index, element); base.add(start + index, element);
} }
@Override
public E remove(int index) {
return null;
}
@Override @Override
public ListIterator<E> listIterator() { public ListIterator<E> listIterator() {
return new SubListItr<>(base, start, start, start + (size - 1)); return new SubListItr<>(base, start, start, start + (size - 1));
@ -340,34 +339,32 @@ public abstract class AbstractBaseList<T> implements List<T> {
return base.toArray(a, this.start + start, len); return base.toArray(a, this.start + start, len);
} }
@Override
protected E remove(Object o, int start, int len) {
checkConcurrentModification();
modCnt++;
return base.remove(o, this.start + start, len);
}
@Override @Override
protected int indexOf(Object o, int start, int len) { protected int indexOf(Object o, int start, int len) {
checkConcurrentModification(); checkConcurrentModification();
return base.indexOf(o, this.start + start, len); return base.indexOf(o, this.start + start, len) - start;
} }
@Override @Override
protected int lastIndexOf(Object o, int start, int len) { protected int lastIndexOf(Object o, int start, int len) {
checkConcurrentModification(); checkConcurrentModification();
return base.lastIndexOf(o, this.start + start, len); return base.lastIndexOf(o, this.start + start, len) - start;
} }
@Override @Override
protected E directSet(int index, E element) { protected E directSet(int index, E element) {
checkConcurrentModification(); checkConcurrentModification();
modCnt++; modCnt++;
return base.directSet(index, element); return base.directSet(start + index, element);
} }
@Override @Override
protected void removeRange(int start, int len) { protected void createGap(int start, int len) {
throw new UnsupportedOperationException();
}
@Override
protected void closeGap(int start, int len) {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }

View File

@ -2,14 +2,18 @@ package dev.asdf00.general.utils.list.internal;
import dev.asdf00.general.utils.list.PrimitiveList; import dev.asdf00.general.utils.list.PrimitiveList;
import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.Objects;
public class ByteList extends PrimitiveList<Boolean> { public class ByteList extends PrimitiveList<Byte> {
private byte[] data; private byte[] data;
public ByteList(int initial) { public ByteList() {
data = new byte[8];
size = 0;
modCnt = 0;
} }
@Override @Override
@ -19,59 +23,118 @@ public class ByteList extends PrimitiveList<Boolean> {
@Override @Override
protected <T1> T1[] toArray(T1[] a, int start, int len) { protected <T1> T1[] toArray(T1[] a, int start, int len) {
return null; Object[] result = Arrays.copyOf(a, len, a.getClass());
for (int i = 0, j = start; i < len; i++, j++) {
result[i] = Byte.valueOf(data[j]);
} }
return (T1[]) result;
@Override
protected Boolean remove(Object o, int start, int len) {
return null;
} }
@Override @Override
protected int indexOf(Object o, int start, int len) { protected int indexOf(Object o, int start, int len) {
return 0; if (!(o instanceof Byte)) {
return -1;
}
byte target = ((Byte) o).byteValue();
for (int i = start; i < start + len; i++) {
if (data[i] == target) {
return i;
}
}
return -1;
} }
@Override @Override
protected int lastIndexOf(Object o, int start, int len) { protected int lastIndexOf(Object o, int start, int len) {
return 0; if (!(o instanceof Byte)) {
return -1;
}
byte target = ((Byte) o).byteValue();
for (int i = (start + len) - 1; i >= start; i++) {
if (data[i] == target) {
return i;
}
}
return -1;
} }
@Override @Override
protected Boolean directSet(int index, Boolean element) { protected Byte directSet(int index, Byte element) {
return null; byte result = data[index];
data[index] = element.byteValue();
return result;
} }
@Override @Override
protected void removeRange(int start, int len) { protected void createGap(int start, int len) {
size += len;
if (size > data.length) {
if (Integer.bitCount(size) == 1) {
data = Arrays.copyOf(data, size);
} else {
data = Arrays.copyOf(data, Integer.highestOneBit(size) + 1);
}
}
System.arraycopy(data, start, data, start + len, (size - len) - start);
} }
@Override @Override
public boolean addAll(Collection<? extends Boolean> c) { protected void closeGap(int start, int len) {
return false; System.arraycopy(data, start + len, data, start, size - (start + len));
size -= len;
} }
@Override @Override
public boolean addAll(int index, Collection<? extends Boolean> c) { public boolean addAll(Collection<? extends Byte> c) {
return false; modCnt++;
int i = size;
createGap(size, c.size());
for (Byte b : c) {
data[i] = b.byteValue();
i++;
}
return true;
}
@Override
public boolean addAll(int index, Collection<? extends Byte> c) {
Objects.checkIndex(index, size);
modCnt++;
int i = index;
createGap(index, c.size());
for (Byte b : c) {
data[i] = b.byteValue();
i++;
}
return true;
} }
@Override @Override
public void clear() { public void clear() {
if (data == null) {
throw new NullPointerException();
}
modCnt++;
data = new byte[8];
size = 0;
}
@Override
public Byte get(int index) {
Objects.checkIndex(index, size);
return data[index];
}
@Override
public void add(int index, Byte element) {
} }
@Override @Override
public Boolean get(int index) { public Byte remove(int index) {
return null; return null;
} }
@Override
public void add(int index, Boolean element) {
}
@Override @Override
public void addByte(byte value) { public void addByte(byte value) {
@ -94,4 +157,8 @@ public class ByteList extends PrimitiveList<Boolean> {
AbstractBaseList.UNSAFE.putInt(data, AbstractBaseList.OFFSET_LEN, size); AbstractBaseList.UNSAFE.putInt(data, AbstractBaseList.OFFSET_LEN, size);
return res; return res;
} }
private void reallocateWithLen(int newLen) {
data = Arrays.copyOf(data, newLen);
}
} }