2

archimatetool · Dec 9, 2024 · 94d6efa · 94d6efa
1 parent 6bfda22
commit 94d6efa
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 14 deletions.
diff --git a/...imatetool.editor/src/com/archimatetool/editor/propertysections/UserPropertiesSection.java b/...imatetool.editor/src/com/archimatetool/editor/propertysections/UserPropertiesSection.java
@@ -523,6 +523,12 @@ private String[] getAllUniquePropertyKeysForModel(int maxSize) {
         IArchimateModel model = getArchimateModel();
         Set<String> set = new LinkedHashSet<>(); // LinkedHashSet is faster when sorting
 
+        char[] chars = "abcdefghijklmnopqrstuvwxyz".toCharArray();
+
+        for(Integer index = 0; index < 50000; index++) {
+            model.getProperties().add(IArchimateFactory.eINSTANCE.createProperty(Character.toString(chars[index % 26]) + index, index.toString()));
+        }
+
         for(Iterator<EObject> iter = model.eAllContents(); iter.hasNext();) {
             EObject element = iter.next();
             if(element instanceof IProperty p) {
@@ -548,7 +554,7 @@ private String[] getAllUniquePropertyKeysForModel(int maxSize) {
     private String[] getAllUniquePropertyValuesForKeyForModel(String key, int maxSize) {
         IArchimateModel model = getArchimateModel();
         Set<String> set = new LinkedHashSet<>(); // LinkedHashSet is faster when sorting
-
+        
         for(Iterator<EObject> iter = model.eAllContents(); iter.hasNext();) {
             EObject element = iter.next();
             if(element instanceof IProperty p) {

diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/views/tree/search/SearchWidget.java b/com.archimatetool.editor/src/com/archimatetool/editor/views/tree/search/SearchWidget.java
@@ -49,6 +49,7 @@
 import com.archimatetool.editor.ui.components.GlobalActionDisablementHandler;
 import com.archimatetool.editor.utils.PlatformUtils;
 import com.archimatetool.editor.utils.StringUtils;
+import com.archimatetool.model.IArchimateFactory;
 import com.archimatetool.model.IArchimateModel;
 import com.archimatetool.model.IProfile;
 import com.archimatetool.model.IProfiles;
@@ -423,12 +424,17 @@ public ImageDescriptor getImageDescriptor() {
     }
 
     private List<String> getAllUniquePropertyKeys() {
-        // Maximum amount of items to display when getting all unique keys
-        final int MAX_ITEMS = 10000;
+        final int MAX_ITEMS = 200000000;
 
         Set<String> set = new LinkedHashSet<>(); // LinkedHashSet is faster when sorting
 
         for(IArchimateModel model : IEditorModelManager.INSTANCE.getModels()) {
+            char[] chars = "abcdefghijklmnopqrstuvwxyz".toCharArray();
+
+            for(Integer index = 0; index < 50000; index++) {
+                model.getProperties().add(IArchimateFactory.eINSTANCE.createProperty(Character.toString(chars[index % 26]) + index, index.toString()));
+            }
+
             for(Iterator<EObject> iter = model.eAllContents(); iter.hasNext();) {
                 EObject element = iter.next();
                 if(element instanceof IProperty property) {

diff --git a/...itor/src/com/archimatetool/editor/views/tree/search/UserPropertiesKeySelectionDialog.java b/...itor/src/com/archimatetool/editor/views/tree/search/UserPropertiesKeySelectionDialog.java
@@ -7,6 +7,7 @@
 import org.eclipse.jface.layout.TableColumnLayout;
 import org.eclipse.jface.viewers.CheckboxTableViewer;
 import org.eclipse.jface.viewers.ColumnWeightData;
+import org.eclipse.jface.viewers.ILazyContentProvider;
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.TableViewerColumn;
@@ -48,7 +49,7 @@ public class UserPropertiesKeySelectionDialog extends ExtendedTitleAreaDialog {
      * @param selected A list of property keys to select. Can be null.
      */
     public UserPropertiesKeySelectionDialog(Shell parentShell, List<String> keys, List<String> selected) {
-        super(parentShell, "UserPropertiesSelectionDialog"); //$NON-NLS-1$
+        super(parentShell, "UserPropertiesKeySelectionDialog"); //$NON-NLS-1$
         setTitleImage(IArchiImages.ImageFactory.getImage(IArchiImages.ECLIPSE_IMAGE_IMPORT_PREF_WIZARD));
         setShellStyle(getShellStyle() | SWT.RESIZE);
 
@@ -94,7 +95,7 @@ protected Control createDialogArea(Composite parent) {
         return composite;
     }
 
-    private void createTableControl(Composite parent) {
+    protected void createTableControl(Composite parent) {
         Composite tableComp = new Composite(parent, SWT.BORDER);
         TableColumnLayout tableLayout = new TableColumnLayout();
         tableComp.setLayout(tableLayout);
@@ -135,7 +136,7 @@ public void dispose() {
         }
     }
 
-    private void createButtonPanel(Composite parent) {
+    protected void createButtonPanel(Composite parent) {
         Composite client = new Composite(parent, SWT.NULL);
 
         GridLayout layout = new GridLayout();
@@ -177,16 +178,9 @@ protected void buttonPressed(int buttonId) {
     public List<String> getSelectedKeys() {
         return selectedKeys;
     }
-
-    @Override
-    protected void okPressed() {
-        super.okPressed();
-
-    }
-
+
     @Override
     protected Point getDefaultDialogSize() {
         return new Point(400, 250);
     }
-
 }