BDC/diy-layout-creator
2
0
Fork 0
mirror of https://github.com/bancika/diy-layout-creator synced 2026-11-07 12:24:58 +10:00
Code Issues Packages Projects Releases Wiki Activity

Fixed null pointer exceptions when trying to add components to the layout in some cases

Browse Source
This commit is contained in:
Bane Stojkovic
2025-02-09 22:04:22 +01:00
parent 40851b4a62
commit 9d0d458fac
5 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
diylc/diylc-core/src/org/diylc/presenter/InstantiationManager.java
+8 -7
View File
@@ -25,12 +25,13 @@ import java.awt.geom.Point2D;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
import org.apache.log4j.Logger;
import org.diylc.appframework.miscutils.ConfigurationManager;
import org.diylc.clipboard.ComponentTransferable;
@@ -341,17 +342,17 @@ public class InstantiationManager {
*/
public String createUniqueName(ComponentType componentType, List<IDIYComponent<?>> components) {
boolean exists = true;
String[] takenNames = new String[components.size()];
for (int j = 0; j < components.size(); j++) {
takenNames[j] = components.get(j).getName();
}
Arrays.sort(takenNames);
Set<String> takenNames = components.stream()
.map(x -> x.getName())
.filter(Objects::nonNull)
.collect(Collectors.toSet());
int i = 0;
while (exists) {
i++;
String name = componentType.getNamePrefix() + i;
exists = false;
if (Arrays.binarySearch(takenNames, name) >= 0) {
if (takenNames.contains(name)) {
exists = true;
}
}
diylc/diylc-core/src/org/diylc/presenter/update.xml
+4
View File
@@ -4474,6 +4474,10 @@
<changeType>IMPROVEMENT</changeType>
<description>'Save As' displays the current file name by default</description>
</org.diylc.appframework.update.Change>
<org.diylc.appframework.update.Change>
<changeType>BUG_FIX</changeType>
<description>Fixed null pointer exceptions when trying to add components to the layout in some cases</description>
</org.diylc.appframework.update.Change>
</changes>
<url>https://github.com/bancika/diy-layout-creator/releases</url>
</org.diylc.appframework.update.Version>
diylc/diylc-library/lib/diylc-core.jar
BIN
View File
Binary file not shown.
diylc/diylc-swing/lib/diylc-core.jar
BIN
View File
Binary file not shown.
diylc/diylc-swing/src/org/diylc/swing/ActionFactory.java
-3
View File
@@ -24,7 +24,6 @@ import java.awt.datatransfer.ClipboardOwner;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
import java.awt.geom.Area;
import java.awt.print.PrinterJob;
import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileOutputStream;
@@ -48,8 +47,6 @@ import javax.swing.JOptionPane;
import javax.swing.KeyStroke;
import javax.swing.filechooser.FileFilter;
import org.apache.log4j.Logger;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.printing.PDFPageable;
import org.diylc.appframework.miscutils.ConfigurationManager;
import org.diylc.appframework.miscutils.IConfigListener;
import org.diylc.appframework.miscutils.InMemoryConfigurationManager;