You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2015/07/28 16:19:57 UTC

svn commit: r1693097 - in /directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common: actions/ widgets/ widgets/connection/ widgets/search/

Author: elecharny
Date: Tue Jul 28 14:19:57 2015
New Revision: 1693097

URL: http://svn.apache.org/r1693097
Log:
o Use Integer.valueOf() instead of new Integer

Modified:
    directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/DeleteAction.java
    directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/ListContentProposalProvider.java
    directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/BrowserParameterPage.java
    directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/EditorParameterPage.java
    directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/LimitWidget.java
    directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/ReturningAttributesContentAssistProcessor.java
    directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/SearchPageWrapper.java

Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/DeleteAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/DeleteAction.java?rev=1693097&r1=1693096&r2=1693097&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/DeleteAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/DeleteAction.java Tue Jul 28 14:19:57 2015
@@ -472,10 +472,10 @@ public class DeleteAction extends Browse
             // check if ALL values of objectClass or a MUST attribute are selected
             if ( !attributeNameToSelectedValuesCountMap.containsKey( atd ) )
             {
-                attributeNameToSelectedValuesCountMap.put( atd, new Integer( 0 ) );
+                attributeNameToSelectedValuesCountMap.put( atd, Integer.valueOf(  0 ) );
             }
             int count = ( attributeNameToSelectedValuesCountMap.get( atd ) ).intValue() + 1;
-            attributeNameToSelectedValuesCountMap.put( atd, new Integer( count ) );
+            attributeNameToSelectedValuesCountMap.put( atd, Integer.valueOf( count ) );
             if ( value.getAttribute().isObjectClassAttribute() && count >= ah.getValueSize() )
             {
                 message.append( Messages.getString( "DeleteAction.DeleteObjectClass" ) ); //$NON-NLS-1$

Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/ListContentProposalProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/ListContentProposalProvider.java?rev=1693097&r1=1693096&r2=1693097&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/ListContentProposalProvider.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/ListContentProposalProvider.java Tue Jul 28 14:19:57 2015
@@ -120,7 +120,7 @@ public class ListContentProposalProvider
     {
         if ( proposals == null )
         {
-            proposals = new ArrayList<String>();
+            this.proposals = new ArrayList<String>();
         }
 
         this.proposals = proposals;

Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/BrowserParameterPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/BrowserParameterPage.java?rev=1693097&r1=1693096&r2=1693097&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/BrowserParameterPage.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/BrowserParameterPage.java Tue Jul 28 14:19:57 2015
@@ -271,12 +271,13 @@ public class BrowserParameterPage extend
         int pageSize;
         try
         {
-            pageSize = new Integer( pagedSearchSizeText.getText() ).intValue();
+            pageSize = Integer.valueOf( pagedSearchSizeText.getText() );
         }
         catch ( NumberFormatException e )
         {
             pageSize = 100;
         }
+        
         return pageSize;
     }
 
@@ -847,8 +848,8 @@ public class BrowserParameterPage extend
         String countLimit = ldapUrl.getExtensionValue( X_COUNT_LIMIT );
         try
         {
-            parameter.setExtendedIntProperty( IBrowserConnection.CONNECTION_PARAMETER_COUNT_LIMIT, new Integer(
-                countLimit ).intValue() );
+            parameter.setExtendedIntProperty( IBrowserConnection.CONNECTION_PARAMETER_COUNT_LIMIT, 
+                Integer.valueOf( countLimit ) );
         }
         catch ( NumberFormatException e )
         {
@@ -859,8 +860,8 @@ public class BrowserParameterPage extend
         String timeLimit = ldapUrl.getExtensionValue( X_TIME_LIMIT );
         try
         {
-            parameter.setExtendedIntProperty( IBrowserConnection.CONNECTION_PARAMETER_TIME_LIMIT, new Integer(
-                timeLimit ).intValue() );
+            parameter.setExtendedIntProperty( IBrowserConnection.CONNECTION_PARAMETER_TIME_LIMIT, 
+                Integer.valueOf( timeLimit ) );
         }
         catch ( NumberFormatException e )
         {
@@ -928,7 +929,7 @@ public class BrowserParameterPage extend
             try
             {
                 parameter.setExtendedIntProperty( IBrowserConnection.CONNECTION_PARAMETER_PAGED_SEARCH_SIZE,
-                    new Integer( pagedSearchSize ).intValue() );
+                    Integer.valueOf( pagedSearchSize ) );
             }
             catch ( NumberFormatException e )
             {

Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/EditorParameterPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/EditorParameterPage.java?rev=1693097&r1=1693096&r2=1693097&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/EditorParameterPage.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/EditorParameterPage.java Tue Jul 28 14:19:57 2015
@@ -314,8 +314,8 @@ public class EditorParameterPage extends
         String modifyMode = ldapUrl.getExtensionValue( X_MODIFY_MODE );
         try
         {
-            parameter.setExtendedIntProperty( IBrowserConnection.CONNECTION_PARAMETER_MODIFY_MODE, new Integer(
-                modifyMode ).intValue() );
+            parameter.setExtendedIntProperty( IBrowserConnection.CONNECTION_PARAMETER_MODIFY_MODE, 
+                Integer.valueOf( modifyMode ) );
         }
         catch ( NumberFormatException e )
         {
@@ -327,8 +327,8 @@ public class EditorParameterPage extends
         String modifyModeNoEMR = ldapUrl.getExtensionValue( X_MODIFY_MODE_NO_EMR );
         try
         {
-            parameter.setExtendedIntProperty( IBrowserConnection.CONNECTION_PARAMETER_MODIFY_MODE_NO_EMR, new Integer(
-                modifyModeNoEMR ).intValue() );
+            parameter.setExtendedIntProperty( IBrowserConnection.CONNECTION_PARAMETER_MODIFY_MODE_NO_EMR, 
+                Integer.valueOf( modifyModeNoEMR ) );
         }
         catch ( NumberFormatException e )
         {
@@ -340,8 +340,8 @@ public class EditorParameterPage extends
         String modifyOrder = ldapUrl.getExtensionValue( X_MODIFY_ORDER );
         try
         {
-            parameter.setExtendedIntProperty( IBrowserConnection.CONNECTION_PARAMETER_MODIFY_ORDER, new Integer(
-                modifyOrder ).intValue() );
+            parameter.setExtendedIntProperty( IBrowserConnection.CONNECTION_PARAMETER_MODIFY_ORDER, 
+                Integer.valueOf( modifyOrder ) );
         }
         catch ( NumberFormatException e )
         {

Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/LimitWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/LimitWidget.java?rev=1693097&r1=1693096&r2=1693097&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/LimitWidget.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/LimitWidget.java Tue Jul 28 14:19:57 2015
@@ -187,7 +187,7 @@ public class LimitWidget extends Abstrac
         int countLimit;
         try
         {
-            countLimit = new Integer( countLimitText.getText() ).intValue();
+            countLimit = Integer.valueOf( countLimitText.getText() );
         }
         catch ( NumberFormatException e )
         {
@@ -207,7 +207,7 @@ public class LimitWidget extends Abstrac
         int timeLimit;
         try
         {
-            timeLimit = new Integer( timeLimitText.getText() ).intValue();
+            timeLimit = Integer.valueOf( timeLimitText.getText() );
         }
         catch ( NumberFormatException e )
         {

Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/ReturningAttributesContentAssistProcessor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/ReturningAttributesContentAssistProcessor.java?rev=1693097&r1=1693096&r2=1693097&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/ReturningAttributesContentAssistProcessor.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/ReturningAttributesContentAssistProcessor.java Tue Jul 28 14:19:57 2015
@@ -86,7 +86,7 @@ public class ReturningAttributesContentA
     {
         if ( proposals == null )
         {
-            proposals = new ArrayList<String>();
+            this.proposals = new ArrayList<String>();
         }
 
         // sort proposals, attributes first

Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/SearchPageWrapper.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/SearchPageWrapper.java?rev=1693097&r1=1693096&r2=1693097&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/SearchPageWrapper.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/SearchPageWrapper.java Tue Jul 28 14:19:57 2015
@@ -880,7 +880,7 @@ public class SearchPageWrapper extends A
                 int pageSize;
                 try
                 {
-                    pageSize = new Integer( pagedSearchControlSizeText.getText() ).intValue();
+                    pageSize = Integer.valueOf( pagedSearchControlSizeText.getText() );
                 }
                 catch ( NumberFormatException e )
                 {