Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BC49810664 for ; Mon, 10 Jun 2013 12:21:07 +0000 (UTC) Received: (qmail 65191 invoked by uid 500); 10 Jun 2013 12:21:07 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 65148 invoked by uid 500); 10 Jun 2013 12:21:06 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 65137 invoked by uid 99); 10 Jun 2013 12:21:06 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Jun 2013 12:21:06 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Jun 2013 12:21:01 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A414223888D2; Mon, 10 Jun 2013 12:20:40 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1491433 - in /directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view: widget/ wrappers/ Date: Mon, 10 Jun 2013 12:20:40 -0000 To: commits@directory.apache.org From: pamarcelot@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130610122040.A414223888D2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pamarcelot Date: Mon Jun 10 12:20:39 2013 New Revision: 1491433 URL: http://svn.apache.org/r1491433 Log: Fixed warnings. Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/DifferencesWidgetPropertiesLabelProvider.java directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/DifferencesWidgetSchemaLabelProvider.java directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/Folder.java directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/PropertySorter.java directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/TypeSorter.java directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/Folder.java Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/DifferencesWidgetPropertiesLabelProvider.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/DifferencesWidgetPropertiesLabelProvider.java?rev=1491433&r1=1491432&r2=1491433&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/DifferencesWidgetPropertiesLabelProvider.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/DifferencesWidgetPropertiesLabelProvider.java Mon Jun 10 12:20:39 2013 @@ -60,15 +60,17 @@ public class DifferencesWidgetProperties if ( element instanceof PropertyDifference ) { PropertyDifference propertyDifference = ( PropertyDifference ) element; + switch ( propertyDifference.getType() ) { case ADDED: return Activator.getDefault().getImage( PluginConstants.IMG_DIFFERENCE_PROPERTY_ADD ); - case MODIFIED: return Activator.getDefault().getImage( PluginConstants.IMG_DIFFERENCE_PROPERTY_MODIFY ); case REMOVED: return Activator.getDefault().getImage( PluginConstants.IMG_DIFFERENCE_PROPERTY_REMOVE ); + default: + break; } } @@ -85,6 +87,7 @@ public class DifferencesWidgetProperties if ( element instanceof AliasDifference ) { AliasDifference diff = ( AliasDifference ) element; + switch ( diff.getType() ) { case ADDED: @@ -95,33 +98,42 @@ public class DifferencesWidgetProperties return NLS .bind( Messages.getString( "DifferencesWidgetPropertiesLabelProvider.RemoveAlias" ), new Object[] { diff.getOldValue() } ); //$NON-NLS-1$ + default: + break; } } else if ( element instanceof ClassTypeDifference ) { ClassTypeDifference diff = ( ClassTypeDifference ) element; + switch ( diff.getType() ) { case MODIFIED: return NLS .bind( Messages.getString( "DifferencesWidgetPropertiesLabelProvider.ModifiedClassType" ), new Object[] { diff.getNewValue(), diff.getOldValue() } ); //$NON-NLS-1$ + default: + break; } } else if ( element instanceof CollectiveDifference ) { CollectiveDifference diff = ( CollectiveDifference ) element; + switch ( diff.getType() ) { case MODIFIED: return NLS .bind( Messages.getString( "DifferencesWidgetPropertiesLabelProvider.ModifiedCollective" ), new Object[] { diff.getNewValue(), diff.getOldValue() } ); //$NON-NLS-1$ + default: + break; } } else if ( element instanceof DescriptionDifference ) { DescriptionDifference diff = ( DescriptionDifference ) element; + switch ( diff.getType() ) { case ADDED: @@ -136,11 +148,14 @@ public class DifferencesWidgetProperties return NLS .bind( Messages.getString( "DifferencesWidgetPropertiesLabelProvider.RemovedDescription" ), new Object[] { diff.getOldValue() } ); //$NON-NLS-1$ + default: + break; } } else if ( element instanceof EqualityDifference ) { EqualityDifference diff = ( EqualityDifference ) element; + switch ( diff.getType() ) { case ADDED: @@ -155,11 +170,14 @@ public class DifferencesWidgetProperties return NLS .bind( Messages.getString( "DifferencesWidgetPropertiesLabelProvider.RemovedMatchingRule" ), new Object[] { diff.getOldValue() } ); //$NON-NLS-1$ + default: + break; } } else if ( element instanceof MandatoryATDifference ) { MandatoryATDifference diff = ( MandatoryATDifference ) element; + switch ( diff.getType() ) { case ADDED: @@ -171,11 +189,14 @@ public class DifferencesWidgetProperties .bind( Messages .getString( "DifferencesWidgetPropertiesLabelProvider.RemovedMandatoryAttributeType" ), new Object[] { diff.getOldValue() } ); //$NON-NLS-1$ + default: + break; } } else if ( element instanceof NoUserModificationDifference ) { NoUserModificationDifference diff = ( NoUserModificationDifference ) element; + switch ( diff.getType() ) { case MODIFIED: @@ -183,22 +204,28 @@ public class DifferencesWidgetProperties .bind( Messages .getString( "DifferencesWidgetPropertiesLabelProvider.ModifiedNoUserModificationValue" ), new Object[] { diff.getNewValue(), diff.getOldValue() } ); //$NON-NLS-1$ + default: + break; } } else if ( element instanceof ObsoleteDifference ) { ObsoleteDifference diff = ( ObsoleteDifference ) element; + switch ( diff.getType() ) { case MODIFIED: return NLS .bind( Messages.getString( "DifferencesWidgetPropertiesLabelProvider.ModifiedObsoleteValue" ), new Object[] { diff.getNewValue(), diff.getOldValue() } ); //$NON-NLS-1$ + default: + break; } } else if ( element instanceof OptionalATDifference ) { OptionalATDifference diff = ( OptionalATDifference ) element; + switch ( diff.getType() ) { case ADDED: @@ -210,11 +237,14 @@ public class DifferencesWidgetProperties .bind( Messages .getString( "DifferencesWidgetPropertiesLabelProvider.RemovedOptionalAttributeType" ), new Object[] { diff.getOldValue() } ); //$NON-NLS-1$ + default: + break; } } else if ( element instanceof OrderingDifference ) { OrderingDifference diff = ( OrderingDifference ) element; + switch ( diff.getType() ) { case ADDED: @@ -230,22 +260,28 @@ public class DifferencesWidgetProperties return NLS .bind( Messages.getString( "DifferencesWidgetPropertiesLabelProvider.RemovedOrderingMatchingRule" ), new Object[] { diff.getOldValue() } ); //$NON-NLS-1$ + default: + break; } } else if ( element instanceof SingleValueDifference ) { SingleValueDifference diff = ( SingleValueDifference ) element; + switch ( diff.getType() ) { case MODIFIED: return NLS .bind( Messages.getString( "DifferencesWidgetPropertiesLabelProvider.ModifiedSingleValueValue" ), new Object[] { diff.getNewValue(), diff.getOldValue() } ); //$NON-NLS-1$ + default: + break; } } else if ( element instanceof SubstringDifference ) { SubstringDifference diff = ( SubstringDifference ) element; + switch ( diff.getType() ) { case ADDED: @@ -262,11 +298,14 @@ public class DifferencesWidgetProperties .bind( Messages .getString( "DifferencesWidgetPropertiesLabelProvider.RemovedSubstringMatchingRule" ), new Object[] { diff.getOldValue() } ); //$NON-NLS-1$ + default: + break; } } else if ( element instanceof SuperiorATDifference ) { SuperiorATDifference diff = ( SuperiorATDifference ) element; + switch ( diff.getType() ) { case ADDED: @@ -281,11 +320,14 @@ public class DifferencesWidgetProperties return NLS .bind( Messages.getString( "DifferencesWidgetPropertiesLabelProvider.RemovedSuperior" ), new Object[] { diff.getOldValue() } ); //$NON-NLS-1$ + default: + break; } } else if ( element instanceof SuperiorOCDifference ) { SuperiorOCDifference diff = ( SuperiorOCDifference ) element; + switch ( diff.getType() ) { case ADDED: @@ -296,6 +338,8 @@ public class DifferencesWidgetProperties return NLS .bind( Messages.getString( "DifferencesWidgetPropertiesLabelProvider.RemovedSuperior" ), new Object[] { diff.getOldValue() } ); //$NON-NLS-1$ + default: + break; } } else if ( element instanceof SyntaxDifference ) @@ -315,6 +359,8 @@ public class DifferencesWidgetProperties return NLS .bind( Messages.getString( "DifferencesWidgetPropertiesLabelProvider.RemovedSyntax" ), new Object[] { diff.getOldValue() } ); //$NON-NLS-1$ + default: + break; } } else if ( element instanceof SyntaxLengthDifference ) @@ -334,6 +380,8 @@ public class DifferencesWidgetProperties return NLS .bind( Messages.getString( "DifferencesWidgetPropertiesLabelProvider.RemovedSyntaxLength" ), new Object[] { diff.getOldValue() } ); //$NON-NLS-1$ + default: + break; } } else if ( element instanceof UsageDifference ) @@ -345,6 +393,8 @@ public class DifferencesWidgetProperties return NLS .bind( Messages.getString( "DifferencesWidgetPropertiesLabelProvider.ModifiedUsage" ), new Object[] { diff.getNewValue(), diff.getOldValue() } ); //$NON-NLS-1$ + default: + break; } } Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/DifferencesWidgetSchemaLabelProvider.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/DifferencesWidgetSchemaLabelProvider.java?rev=1491433&r1=1491432&r2=1491433&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/DifferencesWidgetSchemaLabelProvider.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/DifferencesWidgetSchemaLabelProvider.java Mon Jun 10 12:20:39 2013 @@ -419,6 +419,8 @@ public class DifferencesWidgetSchemaLabe return Activator.getDefault().getImage( PluginConstants.IMG_FOLDER_OC ); case NONE: return Activator.getDefault().getImage( PluginConstants.IMG_FOLDER ); + default: + break; } } Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/Folder.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/Folder.java?rev=1491433&r1=1491432&r2=1491433&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/Folder.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/Folder.java Mon Jun 10 12:20:39 2013 @@ -75,6 +75,8 @@ public class Folder case OBJECT_CLASS: name = Messages.getString( "Folder.ObjectClasses" ); //$NON-NLS-1$ break; + default: + break; } } Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/PropertySorter.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/PropertySorter.java?rev=1491433&r1=1491432&r2=1491433&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/PropertySorter.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/PropertySorter.java Mon Jun 10 12:20:39 2013 @@ -76,6 +76,8 @@ public class PropertySorter implements C return 1; case REMOVED: return 2; + default: + break; } } else if ( diff instanceof ClassTypeDifference ) @@ -84,6 +86,8 @@ public class PropertySorter implements C { case MODIFIED: return 18; + default: + break; } } else if ( diff instanceof CollectiveDifference ) @@ -92,6 +96,8 @@ public class PropertySorter implements C { case MODIFIED: return 21; + default: + break; } } else if ( diff instanceof DescriptionDifference ) @@ -104,6 +110,8 @@ public class PropertySorter implements C return 4; case REMOVED: return 5; + default: + break; } } else if ( diff instanceof EqualityDifference ) @@ -116,6 +124,8 @@ public class PropertySorter implements C return 24; case REMOVED: return 25; + default: + break; } } else if ( diff instanceof MandatoryATDifference ) @@ -126,6 +136,8 @@ public class PropertySorter implements C return 32; case REMOVED: return 33; + default: + break; } } else if ( diff instanceof NoUserModificationDifference ) @@ -134,6 +146,8 @@ public class PropertySorter implements C { case MODIFIED: return 22; + default: + break; } } else if ( diff instanceof ObsoleteDifference ) @@ -142,6 +156,8 @@ public class PropertySorter implements C { case MODIFIED: return 19; + default: + break; } } else if ( diff instanceof OptionalATDifference ) @@ -152,6 +168,8 @@ public class PropertySorter implements C return 34; case REMOVED: return 35; + default: + break; } } else if ( diff instanceof OrderingDifference ) @@ -164,6 +182,8 @@ public class PropertySorter implements C return 27; case REMOVED: return 28; + default: + break; } } else if ( diff instanceof SingleValueDifference ) @@ -172,6 +192,8 @@ public class PropertySorter implements C { case MODIFIED: return 20; + default: + break; } } else if ( diff instanceof SubstringDifference ) @@ -184,6 +206,8 @@ public class PropertySorter implements C return 30; case REMOVED: return 31; + default: + break; } } else if ( diff instanceof SuperiorATDifference ) @@ -196,6 +220,8 @@ public class PropertySorter implements C return 7; case REMOVED: return 8; + default: + break; } } else if ( diff instanceof SuperiorOCDifference ) @@ -206,6 +232,8 @@ public class PropertySorter implements C return 9; case REMOVED: return 10; + default: + break; } } else if ( diff instanceof SyntaxDifference ) @@ -218,6 +246,8 @@ public class PropertySorter implements C return 13; case REMOVED: return 14; + default: + break; } } else if ( diff instanceof SyntaxLengthDifference ) @@ -230,6 +260,8 @@ public class PropertySorter implements C return 16; case REMOVED: return 17; + default: + break; } } else if ( diff instanceof UsageDifference ) @@ -238,6 +270,8 @@ public class PropertySorter implements C { case MODIFIED: return 11; + default: + break; } } Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/TypeSorter.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/TypeSorter.java?rev=1491433&r1=1491432&r2=1491433&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/TypeSorter.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/TypeSorter.java Mon Jun 10 12:20:39 2013 @@ -76,6 +76,8 @@ public class TypeSorter implements Compa return 1; case REMOVED: return 25; + default: + break; } } else if ( diff instanceof ClassTypeDifference ) @@ -84,6 +86,8 @@ public class TypeSorter implements Compa { case MODIFIED: return 17; + default: + break; } } else if ( diff instanceof CollectiveDifference ) @@ -92,6 +96,8 @@ public class TypeSorter implements Compa { case MODIFIED: return 20; + default: + break; } } else if ( diff instanceof DescriptionDifference ) @@ -104,6 +110,8 @@ public class TypeSorter implements Compa return 12; case REMOVED: return 26; + default: + break; } } else if ( diff instanceof EqualityDifference ) @@ -116,6 +124,8 @@ public class TypeSorter implements Compa return 22; case REMOVED: return 31; + default: + break; } } else if ( diff instanceof MandatoryATDifference ) @@ -126,6 +136,8 @@ public class TypeSorter implements Compa return 10; case REMOVED: return 34; + default: + break; } } else if ( diff instanceof NoUserModificationDifference ) @@ -134,6 +146,8 @@ public class TypeSorter implements Compa { case MODIFIED: return 21; + default: + break; } } else if ( diff instanceof ObsoleteDifference ) @@ -142,6 +156,8 @@ public class TypeSorter implements Compa { case MODIFIED: return 18; + default: + break; } } else if ( diff instanceof OptionalATDifference ) @@ -152,6 +168,8 @@ public class TypeSorter implements Compa return 11; case REMOVED: return 35; + default: + break; } } else if ( diff instanceof OrderingDifference ) @@ -164,6 +182,8 @@ public class TypeSorter implements Compa return 23; case REMOVED: return 32; + default: + break; } } else if ( diff instanceof SingleValueDifference ) @@ -172,6 +192,8 @@ public class TypeSorter implements Compa { case MODIFIED: return 19; + default: + break; } } else if ( diff instanceof SubstringDifference ) @@ -184,6 +206,8 @@ public class TypeSorter implements Compa return 24; case REMOVED: return 33; + default: + break; } } else if ( diff instanceof SuperiorATDifference ) @@ -196,6 +220,8 @@ public class TypeSorter implements Compa return 13; case REMOVED: return 27; + default: + break; } } else if ( diff instanceof SuperiorOCDifference ) @@ -206,6 +232,8 @@ public class TypeSorter implements Compa return 4; case REMOVED: return 28; + default: + break; } } else if ( diff instanceof SyntaxDifference ) @@ -218,6 +246,8 @@ public class TypeSorter implements Compa return 15; case REMOVED: return 29; + default: + break; } } else if ( diff instanceof SyntaxLengthDifference ) @@ -230,6 +260,8 @@ public class TypeSorter implements Compa return 16; case REMOVED: return 30; + default: + break; } } else if ( diff instanceof UsageDifference ) @@ -238,6 +270,8 @@ public class TypeSorter implements Compa { case MODIFIED: return 14; + default: + break; } } Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/Folder.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/Folder.java?rev=1491433&r1=1491432&r2=1491433&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/Folder.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/Folder.java Mon Jun 10 12:20:39 2013 @@ -74,6 +74,8 @@ public class Folder extends AbstractTree case WARNING: name = Messages.getString( "Folder.Warnings" ); //$NON-NLS-1$ break; + default: + break; } }