project wide Collection optimization: if contains(e) remove(e) => rem…

…ove(e)
akhil9281 · Mar 3, 2022 · 06baf7f · 06baf7f
1 parent f35b829
commit 06baf7f
Show file tree

Hide file tree

Showing 14 changed files with 16 additions and 40 deletions.
diff --git a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/RunTimeDDCatalog.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/RunTimeDDCatalog.java
@@ -365,8 +365,7 @@ public void addCatalogListener(CatalogListener l) {
     public void removeCatalogListener(CatalogListener l) {
         if (null == l)
             return;
-        if (catalogListeners.contains(l))
-            catalogListeners.remove(l);
+        catalogListeners.remove(l);
     }
 
     public  void fireCatalogListeners() {

diff --git a/...prise/maven.j2ee/src/org/netbeans/modules/maven/j2ee/ui/wizard/ServerSelectionHelper.java b/...prise/maven.j2ee/src/org/netbeans/modules/maven/j2ee/ui/wizard/ServerSelectionHelper.java
@@ -179,12 +179,8 @@ private void updatePlatformVersionModel() {
             }
 
             // We don't support J2EE 1.3 and J2EE 1.4 anymore
-            if (profiles.contains(Profile.J2EE_13)) {
-                profiles.remove(Profile.J2EE_13);
-            }
-            if (profiles.contains(Profile.J2EE_14)) {
-                profiles.remove(Profile.J2EE_14);
-            }
+            profiles.remove(Profile.J2EE_13);
+            profiles.remove(Profile.J2EE_14);
 
             // We want to have Java EE 6 Full profile for all project types except Web project
             if (J2eeModule.Type.WAR.equals(projectType)) {

diff --git a/enterprise/payara.jakartaee/src/org/netbeans/modules/payara/jakartaee/RunTimeDDCatalog.java b/enterprise/payara.jakartaee/src/org/netbeans/modules/payara/jakartaee/RunTimeDDCatalog.java
@@ -357,8 +357,7 @@ public void addCatalogListener(CatalogListener l) {
     public void removeCatalogListener(CatalogListener l) {
         if (null == l)
             return;
-        if (catalogListeners.contains(l))
-            catalogListeners.remove(l);
+        catalogListeners.remove(l);
     }
 
     public  void fireCatalogListeners() {

diff --git a/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/FieldCompletion.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/FieldCompletion.java
@@ -93,9 +93,7 @@ public boolean complete(Map<Object, CompletionProposal> proposals, CompletionCon
         Map<FieldSignature, CompletionItem> result = new CompleteElementHandler(context).getFields();
 
         FieldSignature prefixFieldSignature = new FieldSignature(context.getPrefix());
-        if (result.containsKey(prefixFieldSignature)) {
-            result.remove(prefixFieldSignature);
-        }
+        result.remove(prefixFieldSignature);
         for (Map.Entry<FieldSignature, CompletionItem> e :result.entrySet()) {
             proposals.putIfAbsent(e.getKey(), e.getValue());
         }

diff --git a/ide/db.dataview/src/org/netbeans/modules/db/dataview/output/UpdatedRowContext.java b/ide/db.dataview/src/org/netbeans/modules/db/dataview/output/UpdatedRowContext.java
@@ -49,9 +49,7 @@ public void removeAllUpdates() {
     }
 
     public void removeUpdateForSelectedRow(int row) {
-        if(changedData.containsKey(Integer.valueOf(row))){
-            changedData.remove(Integer.valueOf(row));
-        }
+        changedData.remove(Integer.valueOf(row));
     }
 
     public Set<Integer> getUpdateKeys() {

diff --git a/...ditor.bookmarks/src/org/netbeans/modules/editor/bookmarks/ui/GotoLineOrBookmarkPanel.java b/...ditor.bookmarks/src/org/netbeans/modules/editor/bookmarks/ui/GotoLineOrBookmarkPanel.java
@@ -343,9 +343,7 @@ private String getValue() {
 
     private void updateHistory() {
         String value = getValue();
-        if (history.contains(value)) {
-            history.remove(value); // move item to top
-        }
+        history.remove(value); // move item to top
         history.add(0, value);
         // assure it won't hold more than MAX_ITEMS
         if (history.size() > MAX_HISTORY_ITEMS) {

diff --git a/ide/projectui/src/org/netbeans/modules/project/ui/OpenProjectList.java b/ide/projectui/src/org/netbeans/modules/project/ui/OpenProjectList.java
@@ -1214,9 +1214,7 @@ public void updateTemplatesLRU(final FileObject template) {
 
         String templateName = template.getPath();
 
-        if ( getRecentTemplates().contains( templateName ) ) {
-            getRecentTemplates().remove( templateName );
-        }
+        getRecentTemplates().remove(templateName);
         getRecentTemplates().add( 0, templateName );
 
         if ( getRecentTemplates().size() > 100 ) {

diff --git a/ide/projectui/src/org/netbeans/modules/project/ui/actions/BuildExecutionSupportImpl.java b/ide/projectui/src/org/netbeans/modules/project/ui/actions/BuildExecutionSupportImpl.java
@@ -106,9 +106,7 @@ public void registerFinishedItem(Item item) {
                         list = new ArrayList<BuildExecutionSupport.ActionItem>();
                         historyItems.put(action, list);
                     }
-                    if (list.contains(ai)) {
-                        list.remove(ai);
-                    }
+                    list.remove(ai);
                     list.add(ai);
                     if (list.size() > HISTORY_MAX) {
                         list.remove(0);

diff --git a/ide/schema2beans/src/org/netbeans/modules/schema2beansdev/SchemaRep.java b/ide/schema2beans/src/org/netbeans/modules/schema2beansdev/SchemaRep.java
@@ -3228,8 +3228,7 @@ public void setType(String t) {
                 t = null;
             String oldType = type;
             type = t;
-            if (schemaTypeDefs.containsKey(oldType))  // FIXME
-                schemaTypeDefs.remove(oldType);
+            schemaTypeDefs.remove(oldType); // FIXME
             if (t == null)
                 return;
             putSchemaTypeDef(type, this);

diff --git a/java/java.api.common/src/org/netbeans/modules/java/api/common/ui/PlatformUiSupport.java b/java/java.api.common/src/org/netbeans/modules/java/api/common/ui/PlatformUiSupport.java
@@ -370,7 +370,7 @@ public static void storePlatform(
             if(!javacProfile.equals(props.getProperty(javacProfileKey))) {
                 props.setProperty(javacProfileKey, javacProfile);
             }
-        } else if (props.containsKey(javacProfileKey)) {
+        } else {
             props.remove(javacProfileKey);
         }
 

diff --git a/java/java.freeform/src/org/netbeans/modules/java/freeform/ui/ProjectModel.java b/java/java.freeform/src/org/netbeans/modules/java/freeform/ui/ProjectModel.java
@@ -639,9 +639,7 @@ private void removeSourceLocation(String location) {
         Iterator<JavaProjectGenerator.JavaCompilationUnit> it = javaCompilationUnitsList.iterator();
         while (it.hasNext()) {
             JavaProjectGenerator.JavaCompilationUnit cu = it.next();
-            if (cu.packageRoots.contains(location)) {
-                cu.packageRoots.remove(location);
-            }
+            cu.packageRoots.remove(location);
             if (cu.packageRoots.size() == 0) {
                 it.remove();
             }

diff --git a/platform/core.windows/src/org/netbeans/core/windows/model/DefaultTopComponentGroupModel.java b/platform/core.windows/src/org/netbeans/core/windows/model/DefaultTopComponentGroupModel.java
@@ -202,12 +202,8 @@ public boolean addUnloadedTopComponent(String tcID) {
 
     public boolean removeUnloadedTopComponent(String tcID) {
         synchronized(LOCK_TOPCOMPONENTS) {
-            if(openingTopComponents.contains(tcID)) {
-                openingTopComponents.remove(tcID);
-            }
-            if(closingTopComponents.contains(tcID)) {
-                closingTopComponents.remove(tcID);
-            }
+            openingTopComponents.remove(tcID);
+            closingTopComponents.remove(tcID);
             return topComponents.remove(tcID);
         }
     }

diff --git a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerRowSorter.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerRowSorter.java
@@ -188,7 +188,7 @@ boolean getFiltersMode() {
 
     void addRowFilter(RowFilter filter) {
         if (filters == null) filters = new HashSet();
-        if (filters.contains(filter)) filters.remove(filter);
+        filters.remove(filter);
         filters.add(filter);
         refreshRowFilter();
     }

diff --git a/...s.codegen/src/org/netbeans/modules/websvc/saas/codegen/util/UniqueVariableNameFinder.java b/...s.codegen/src/org/netbeans/modules/websvc/saas/codegen/util/UniqueVariableNameFinder.java
@@ -40,8 +40,7 @@ public UniqueVariableNameFinder() {
     }
 
     public void addPattern(String pattern, int count) {
-        if(varDeclMap.containsKey(pattern))
-            varDeclMap.remove(pattern);
+        varDeclMap.remove(pattern);
         varDeclMap.put(pattern, new Integer(count));
     }