[BUILD] Enforce package naming conventions PMD

saros-project · May 27, 2020 · ccaabf1 · ccaabf1
1 parent b87e670
commit ccaabf1
Show file tree

Hide file tree

Showing 31 changed files with 56 additions and 54 deletions.
diff --git a/eclipse/META-INF/MANIFEST.MF b/eclipse/META-INF/MANIFEST.MF
@@ -93,15 +93,15 @@ Export-Package: saros;
    org.eclipse.jface.viewers,
    saros.invitation,
    saros.net",
- saros.ui.commandHandlers,
+ saros.ui.command_handlers,
  saros.ui.decorators;
   uses:="org.eclipse.core.runtime,
    saros.project,
    org.eclipse.jface.viewers,
    saros.editor,
    saros.invitation",
  saros.ui.model,
- saros.ui.preferencePages,
+ saros.ui.preference_pages,
  saros.ui.util,
  saros.ui.util.selection,
  saros.ui.util.selection.retriever,

diff --git a/eclipse/plugin.xml b/eclipse/plugin.xml
@@ -56,35 +56,35 @@
       </decorator>
    </extension>
    <extension
-         point="org.eclipse.ui.preferencePages">
+         point="org.eclipse.ui.preference_pages">
       <page
-            class="saros.ui.preferencePages.GeneralPreferencePage"
+            class="saros.ui.preference_pages.GeneralPreferencePage"
             id="saros.preferences"
             name="Saros"/>
       <page
             category="saros.preferences"
-            class="saros.ui.preferencePages.AdvancedPreferencePage"
+            class="saros.ui.preference_pages.AdvancedPreferencePage"
             id="saros.preferences.advanced"
             name="Advanced"/>
       <page
             category="saros.preferences"
-            class="saros.ui.preferencePages.NetworkPreferencePage"
+            class="saros.ui.preference_pages.NetworkPreferencePage"
             id="saros.preferences.network"
             name="Network"/>
       <!--page
             category="saros.preferences"
-            class="saros.ui.preferencePages.FeedbackPreferencePage"
+            class="saros.ui.preference_pages.FeedbackPreferencePage"
             id="saros.preferences.feedback"
             name="Feedback"/-->
       <page
             category="saros.preferences"
-            class="saros.ui.preferencePages.CommunicationPreferencePage"
+            class="saros.ui.preference_pages.CommunicationPreferencePage"
             id="saros.preferences.communication"
             name="Communication">
       </page>
       <page
               category="saros.preferences"
-              class="saros.ui.preferencePages.PersonalizationPreferencePage"
+              class="saros.ui.preference_pages.PersonalizationPreferencePage"
               id="saros.preferences.personalization"
               name="Personalization">
       </page>
@@ -550,34 +550,34 @@
    <extension
          point="org.eclipse.ui.handlers">
       <handler
-            class="saros.ui.commandHandlers.GettingStartedHandler"
+            class="saros.ui.command_handlers.GettingStartedHandler"
             commandId="saros.ui.commands.GettingStarted">
       </handler>
       <handler
-            class="saros.ui.commandHandlers.StartSarosConfigurationHandler"
+            class="saros.ui.command_handlers.StartSarosConfigurationHandler"
             commandId="saros.ui.commands.StartSarosConfiguration">
       </handler>
       <handler
-            class="saros.ui.commandHandlers.CreateXMPPAccountHandler"
+            class="saros.ui.command_handlers.CreateXMPPAccountHandler"
             commandId="saros.ui.commands.CreateXMPPAccount">
       </handler>
       <handler
-            class="saros.ui.commandHandlers.AddXMPPAccountHandler"
+            class="saros.ui.command_handlers.AddXMPPAccountHandler"
             commandId="saros.ui.commands.AddXMPPAccount">
       </handler>
       <handler
-            class="saros.ui.commandHandlers.AddContactHandler"
+            class="saros.ui.command_handlers.AddContactHandler"
             commandId="saros.ui.commands.AddContact">
          <enabledWhen>
              <reference definitionId="saros.ui.definitions.isConnected" />
          </enabledWhen>
       </handler>
       <handler
-            class="saros.ui.commandHandlers.OpenSarosPreferencesHandler"
+            class="saros.ui.command_handlers.OpenSarosPreferencesHandler"
             commandId="saros.ui.commands.OpenSarosPreferences">
       </handler>
       <handler
-      class="saros.ui.commandHandlers.ShareProjectHandler"
+      class="saros.ui.command_handlers.ShareProjectHandler"
             commandId="saros.ui.commands.ShareResource">
          <enabledWhen>
             <and>
@@ -593,7 +593,7 @@
          </enabledWhen>
       </handler>
       <handler
-            class="saros.ui.commandHandlers.SessionLeaveHandler"
+            class="saros.ui.command_handlers.SessionLeaveHandler"
             commandId="saros.ui.commands.SessionLeave">
          <activeWhen>
             <and>
@@ -607,7 +607,7 @@
          </activeWhen>
       </handler>
       <handler
-            class="saros.ui.commandHandlers.SessionAddProjectsHandler"
+            class="saros.ui.command_handlers.SessionAddProjectsHandler"
             commandId="saros.ui.commands.SessionAddResources">
          <activeWhen>
             <and>
@@ -626,7 +626,7 @@
          </enabledWhen>
       </handler>
       <handler
-            class="saros.ui.commandHandlers.SessionAddContactsHandler"
+            class="saros.ui.command_handlers.SessionAddContactsHandler"
             commandId="saros.ui.commands.SessionAddContacts">
          <activeWhen>
             <and>
@@ -640,7 +640,7 @@
          </activeWhen>
       </handler>
       <handler
-            class="saros.ui.commandHandlers.SessionAddSelectedProjectsHandler"
+            class="saros.ui.command_handlers.SessionAddSelectedProjectsHandler"
             commandId="saros.ui.commands.SessionAddSelectedResources">
          <activeWhen>
             <and>
@@ -667,7 +667,7 @@
          </enabledWhen>
       </handler>
       <handler
-            class="saros.ui.commandHandlers.SessionAddSelectedContactsHandler"
+            class="saros.ui.command_handlers.SessionAddSelectedContactsHandler"
             commandId="saros.ui.commands.SessionAddSelectedContacts">
          <activeWhen>
             <and>
@@ -1386,7 +1386,7 @@
    <extension
          point="org.eclipse.ui.services">
       <sourceProvider
-            provider="saros.serviceProviders.SarosSourceProvider">
+            provider="saros.service_providers.SarosSourceProvider">
          <variable
                name="saros.Saros"
                priorityLevel="workbench">

diff --git a/eclipse/src/saros/feedback/ErrorLogManager.java b/eclipse/src/saros/feedback/ErrorLogManager.java
@@ -22,7 +22,7 @@
 import saros.preferences.EclipsePreferenceConstants;
 import saros.repackaged.picocontainer.Startable;
 import saros.session.ISarosSession;
-import saros.ui.preferencePages.FeedbackPreferencePage;
+import saros.ui.preference_pages.FeedbackPreferencePage;
 
 /**
  * The ErrorLogManager is supposed to upload an error log file to our server at the end of a

diff --git a/eclipse/src/saros/feedback/StatisticManager.java b/eclipse/src/saros/feedback/StatisticManager.java
@@ -16,7 +16,7 @@
 import saros.annotations.Component;
 import saros.preferences.EclipsePreferenceConstants;
 import saros.repackaged.picocontainer.Startable;
-import saros.ui.preferencePages.FeedbackPreferencePage;
+import saros.ui.preference_pages.FeedbackPreferencePage;
 import saros.util.StackTrace;
 
 /**

diff --git a/...serviceProviders/SarosSourceProvider.java → ...ervice_providers/SarosSourceProvider.java b/...serviceProviders/SarosSourceProvider.java → ...ervice_providers/SarosSourceProvider.java
@@ -1,4 +1,4 @@
-package saros.serviceProviders;
+package saros.service_providers;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -24,10 +24,10 @@
  */
 public class SarosSourceProvider extends AbstractSourceProvider {
 
-  /** Corresponds to a serviceProvider variable as defined in Extension org.eclipse.ui.services. */
+  /** Corresponds to a service_provider variable as defined in Extension org.eclipse.ui.services. */
   public static final String SAROS = "saros.Saros";
 
-  /** Corresponds to a serviceProvider variable as defined in Extension org.eclipse.ui.services. */
+  /** Corresponds to a service_provider variable as defined in Extension org.eclipse.ui.services. */
   public static final String SAROS_SESSION = "saros.SarosSession";
 
   @Inject private Saros saros;

diff --git a/.../saros/serviceProviders/package-info.java → ...saros/service_providers/package-info.java b/.../saros/serviceProviders/package-info.java → ...saros/service_providers/package-info.java
@@ -3,4 +3,4 @@
  * href="http://wiki.eclipse.org/Command_Core_Expressions">Eclipse Core Expressions</a>, which are
  * programmatic or declarative expressions.
  */
-package saros.serviceProviders;
+package saros.service_providers;
diff --git a/...ui/commandHandlers/AddContactHandler.java → ...i/command_handlers/AddContactHandler.java b/...ui/commandHandlers/AddContactHandler.java → ...i/command_handlers/AddContactHandler.java
@@ -1,4 +1,4 @@
-package saros.ui.commandHandlers;
+package saros.ui.command_handlers;
 
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;

diff --git a/...ommandHandlers/AddXMPPAccountHandler.java → ...mmand_handlers/AddXMPPAccountHandler.java b/...ommandHandlers/AddXMPPAccountHandler.java → ...mmand_handlers/AddXMPPAccountHandler.java
@@ -1,4 +1,4 @@
-package saros.ui.commandHandlers;
+package saros.ui.command_handlers;
 
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;

diff --git a/...andHandlers/CreateXMPPAccountHandler.java → ...nd_handlers/CreateXMPPAccountHandler.java b/...andHandlers/CreateXMPPAccountHandler.java → ...nd_handlers/CreateXMPPAccountHandler.java
@@ -1,4 +1,4 @@
-package saros.ui.commandHandlers;
+package saros.ui.command_handlers;
 
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;

diff --git a/...ommandHandlers/GettingStartedHandler.java → ...mmand_handlers/GettingStartedHandler.java b/...ommandHandlers/GettingStartedHandler.java → ...mmand_handlers/GettingStartedHandler.java
@@ -1,4 +1,4 @@
-package saros.ui.commandHandlers;
+package saros.ui.command_handlers;
 
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;

diff --git a/...Handlers/OpenSarosPreferencesHandler.java → ...handlers/OpenSarosPreferencesHandler.java b/...Handlers/OpenSarosPreferencesHandler.java → ...handlers/OpenSarosPreferencesHandler.java
@@ -1,4 +1,4 @@
-package saros.ui.commandHandlers;
+package saros.ui.command_handlers;
 
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;

diff --git a/...ndHandlers/SessionAddContactsHandler.java → ...d_handlers/SessionAddContactsHandler.java b/...ndHandlers/SessionAddContactsHandler.java → ...d_handlers/SessionAddContactsHandler.java
@@ -1,4 +1,4 @@
-package saros.ui.commandHandlers;
+package saros.ui.command_handlers;
 
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;

diff --git a/...ndHandlers/SessionAddProjectsHandler.java → ...d_handlers/SessionAddProjectsHandler.java b/...ndHandlers/SessionAddProjectsHandler.java → ...d_handlers/SessionAddProjectsHandler.java
@@ -1,4 +1,4 @@
-package saros.ui.commandHandlers;
+package saros.ui.command_handlers;
 
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;

diff --git a/...rs/SessionAddSelectedContactsHandler.java → ...rs/SessionAddSelectedContactsHandler.java b/...rs/SessionAddSelectedContactsHandler.java → ...rs/SessionAddSelectedContactsHandler.java
@@ -1,4 +1,4 @@
-package saros.ui.commandHandlers;
+package saros.ui.command_handlers;
 
 import java.util.List;
 import org.eclipse.core.commands.AbstractHandler;

diff --git a/...rs/SessionAddSelectedProjectsHandler.java → ...rs/SessionAddSelectedProjectsHandler.java b/...rs/SessionAddSelectedProjectsHandler.java → ...rs/SessionAddSelectedProjectsHandler.java
@@ -1,4 +1,4 @@
-package saros.ui.commandHandlers;
+package saros.ui.command_handlers;
 
 import java.util.List;
 import org.eclipse.core.commands.AbstractHandler;

diff --git a/.../commandHandlers/SessionLeaveHandler.java → ...command_handlers/SessionLeaveHandler.java b/.../commandHandlers/SessionLeaveHandler.java → ...command_handlers/SessionLeaveHandler.java
@@ -1,4 +1,4 @@
-package saros.ui.commandHandlers;
+package saros.ui.command_handlers;
 
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;

diff --git a/.../commandHandlers/ShareProjectHandler.java → ...command_handlers/ShareProjectHandler.java b/.../commandHandlers/ShareProjectHandler.java → ...command_handlers/ShareProjectHandler.java
@@ -1,11 +1,11 @@
-package saros.ui.commandHandlers;
+package saros.ui.command_handlers;
 
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.resources.IResource;
-import saros.ui.menuContributions.StartSessionWithContacts;
-import saros.ui.menuContributions.StartSessionWithProjects;
+import saros.ui.menu_contributions.StartSessionWithContacts;
+import saros.ui.menu_contributions.StartSessionWithProjects;
 import saros.ui.util.WizardUtils;
 import saros.ui.util.selection.retriever.SelectionRetrieverFactory;
 

diff --git a/...dlers/StartSarosConfigurationHandler.java → ...dlers/StartSarosConfigurationHandler.java b/...dlers/StartSarosConfigurationHandler.java → ...dlers/StartSarosConfigurationHandler.java
@@ -1,4 +1,4 @@
-package saros.ui.commandHandlers;
+package saros.ui.command_handlers;
 
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;

diff --git a/...aros/ui/commandHandlers/package-info.java → ...ros/ui/command_handlers/package-info.java b/...aros/ui/commandHandlers/package-info.java → ...ros/ui/command_handlers/package-info.java
@@ -24,4 +24,4 @@
  *     href="http://help.eclipse.org/indigo/topic/org.eclipse.platform.doc.isv/guide/workbench_cmd_handlers.htm">plugin.xml
  *     - org.eclipse.ui.handlers extension point</a>
  */
-package saros.ui.commandHandlers;
+package saros.ui.command_handlers;
diff --git a/...ntributions/StartSessionWithContacts.java → ...ntributions/StartSessionWithContacts.java b/...ntributions/StartSessionWithContacts.java → ...ntributions/StartSessionWithContacts.java
@@ -1,4 +1,4 @@
-package saros.ui.menuContributions;
+package saros.ui.menu_contributions;
 
 import java.util.Collections;
 import java.util.Comparator;

diff --git a/...ntributions/StartSessionWithProjects.java → ...ntributions/StartSessionWithProjects.java b/...ntributions/StartSessionWithProjects.java → ...ntributions/StartSessionWithProjects.java
@@ -1,4 +1,4 @@
-package saros.ui.menuContributions;
+package saros.ui.menu_contributions;
 
 import java.util.Arrays;
 import java.util.Collections;

diff --git a/...os/ui/menuContributions/package-info.java → ...s/ui/menu_contributions/package-info.java b/...os/ui/menuContributions/package-info.java → ...s/ui/menu_contributions/package-info.java
@@ -1,2 +1,2 @@
 /** Classes in this package are responsible to provide MenuItems for Saros Menus. */
-package saros.ui.menuContributions;
+package saros.ui.menu_contributions;
diff --git a/...eferencePages/AdvancedPreferencePage.java → ...ference_pages/AdvancedPreferencePage.java b/...eferencePages/AdvancedPreferencePage.java → ...ference_pages/AdvancedPreferencePage.java
@@ -1,4 +1,4 @@
-package saros.ui.preferencePages;
+package saros.ui.preference_pages;
 
 import org.eclipse.jface.dialogs.MessageDialogWithToggle;
 import org.eclipse.jface.preference.BooleanFieldEditor;

diff --git a/...ncePages/CommunicationPreferencePage.java → ...ce_pages/CommunicationPreferencePage.java b/...ncePages/CommunicationPreferencePage.java → ...ce_pages/CommunicationPreferencePage.java
@@ -1,4 +1,4 @@
-package saros.ui.preferencePages;
+package saros.ui.preference_pages;
 
 import org.eclipse.jface.preference.BooleanFieldEditor;
 import org.eclipse.jface.preference.FieldEditor;

diff --git a/...eferencePages/FeedbackPreferencePage.java → ...ference_pages/FeedbackPreferencePage.java b/...eferencePages/FeedbackPreferencePage.java → ...ference_pages/FeedbackPreferencePage.java
@@ -1,5 +1,5 @@
 /** */
-package saros.ui.preferencePages;
+package saros.ui.preference_pages;
 
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferencePage;

diff --git a/...referencePages/GeneralPreferencePage.java → ...eference_pages/GeneralPreferencePage.java b/...referencePages/GeneralPreferencePage.java → ...eference_pages/GeneralPreferencePage.java
@@ -1,4 +1,4 @@
-package saros.ui.preferencePages;
+package saros.ui.preference_pages;
 
 import java.text.MessageFormat;
 import org.eclipse.jface.dialogs.MessageDialog;

diff --git a/...referencePages/NetworkPreferencePage.java → ...eference_pages/NetworkPreferencePage.java b/...referencePages/NetworkPreferencePage.java → ...eference_pages/NetworkPreferencePage.java
@@ -1,4 +1,4 @@
-package saros.ui.preferencePages;
+package saros.ui.preference_pages;
 
 import java.net.InetAddress;
 import java.util.ArrayList;

diff --git a/...ePages/PersonalizationPreferencePage.java → ..._pages/PersonalizationPreferencePage.java b/...ePages/PersonalizationPreferencePage.java → ..._pages/PersonalizationPreferencePage.java
@@ -1,4 +1,4 @@
-package saros.ui.preferencePages;
+package saros.ui.preference_pages;
 
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferencePage;

diff --git a/...aros/ui/preferencePages/package-info.java → ...ros/ui/preference_pages/package-info.java b/...aros/ui/preferencePages/package-info.java → ...ros/ui/preference_pages/package-info.java
@@ -3,4 +3,4 @@
  * provide several setting options to configurate Saros behavior. Pages have to implement
  * IWorkbenchPreferencePage.
  */
-package saros.ui.preferencePages;
+package saros.ui.preference_pages;
diff --git a/eclipse/src/saros/ui/views/SarosView.java b/eclipse/src/saros/ui/views/SarosView.java
@@ -79,7 +79,7 @@
 import saros.ui.actions.RequestSessionInviteAction;
 import saros.ui.actions.SendFileAction;
 import saros.ui.actions.SkypeAction;
-import saros.ui.menuContributions.StartSessionWithProjects;
+import saros.ui.menu_contributions.StartSessionWithProjects;
 import saros.ui.model.roster.RosterEntryElement;
 import saros.ui.sounds.SoundPlayer;
 import saros.ui.sounds.Sounds;

diff --git a/ruleset.xml b/ruleset.xml
@@ -10,4 +10,6 @@
     <rule ref="category/java/bestpractices.xml/UnusedLocalVariable" />
     <rule ref="category/java/bestpractices.xml/UnusedPrivateField" />
     <rule ref="category/java/bestpractices.xml/UnusedPrivateMethod" />
+
+    <rule ref="category/java/codestyle.xml/PackageCase" />
 </ruleset>