[Libreoffice-commits] core.git: wizards/com

[Robert Antoni Buj i Gelonch]

 wizards/com/sun/star/wizards/ui/UIConsts.java         |   56 +++++++++---------
 wizards/com/sun/star/wizards/ui/event/EventNames.java |   31 ++++-----
 2 files changed, 43 insertions(+), 44 deletions(-)

New commits:
commit cdecac849b2aaf8314f3cb2046f70b3b436519a7
Author: Robert Antoni Buj i Gelonch <robert.buj at gmail.com>
Date:   Tue Oct 14 16:08:30 2014 +0200

    rm ‘public static final’ modifiers from field declarations within interfaces
    
    Change-Id: I2154052f89787b6fe17edb2f6e6ea132347b3d13
    Reviewed-on: https://gerrit.libreoffice.org/11971
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
    Tested-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/wizards/com/sun/star/wizards/ui/UIConsts.java b/wizards/com/sun/star/wizards/ui/UIConsts.java
index 9c4d77c..0d2e956 100644
--- a/wizards/com/sun/star/wizards/ui/UIConsts.java
+++ b/wizards/com/sun/star/wizards/ui/UIConsts.java
@@ -21,41 +21,41 @@ package com.sun.star.wizards.ui;
 public interface UIConsts
 {
 
-    public static final int RID_COMMON = 500;
-    public static final int RID_DB_COMMON = 1000;
-    public static final int RID_FORM = 2200;
-    public static final int RID_QUERY = 2300;
-    public static final int RID_REPORT = 2400;
-    public static final int RID_TABLE = 2600;
-    public static final int RID_IMG_REPORT = 1000;
-    public static final int RID_IMG_FORM = 1100;
-    public static final int RID_IMG_WEB = 1200;
-    public static final Integer INVISIBLESTEP = 99;
-    public static final String INFOIMAGEURL = "private:resource/dbu/image/19205";
-    public static final String INFOIMAGEURL_HC = "private:resource/dbu/image/19230";
+    int RID_COMMON = 500;
+    int RID_DB_COMMON = 1000;
+    int RID_FORM = 2200;
+    int RID_QUERY = 2300;
+    int RID_REPORT = 2400;
+    int RID_TABLE = 2600;
+    int RID_IMG_REPORT = 1000;
+    int RID_IMG_FORM = 1100;
+    int RID_IMG_WEB = 1200;
+    Integer INVISIBLESTEP = 99;
+    String INFOIMAGEURL = "private:resource/dbu/image/19205";
+    String INFOIMAGEURL_HC = "private:resource/dbu/image/19230";
     /**
      * The tabindex of the navigation buttons in a wizard must be assigned a very
      * high tabindex because on every step their taborder must appear at the end
      */
-    public static final short SOFIRSTWIZARDNAVITABINDEX = 30000;
-    public static final Integer INTEGER_8 = 8;
-    public static final Integer INTEGER_12 = 12;
-    public static final Integer INTEGER_14 = 14;
-    public static final Integer INTEGER_16 = 16;
-    public static final Integer INTEGER_40 = 40;
-    public static final Integer INTEGER_50 = 50;
+    short SOFIRSTWIZARDNAVITABINDEX = 30000;
+    Integer INTEGER_8 = 8;
+    Integer INTEGER_12 = 12;
+    Integer INTEGER_14 = 14;
+    Integer INTEGER_16 = 16;
+    Integer INTEGER_40 = 40;
+    Integer INTEGER_50 = 50;
     /**Steps of the QueryWizard
      *
      */
-    public static final int SOFIELDSELECTIONPAGE = 1;
-    public static final int SOSORTINGPAGE = 2;
-    public static final int SOFILTERPAGE = 3;
-    public static final int SOAGGREGATEPAGE = 4;
-    public static final int SOGROUPSELECTIONPAGE = 5;
-    public static final int SOGROUPFILTERPAGE = 6;
-    public static final int SOTITLESPAGE = 7;
-    public static final int SOSUMMARYPAGE = 8;
-    public static final Integer[] INTEGERS = new Integer[]
+    int SOFIELDSELECTIONPAGE = 1;
+    int SOSORTINGPAGE = 2;
+    int SOFILTERPAGE = 3;
+    int SOAGGREGATEPAGE = 4;
+    int SOGROUPSELECTIONPAGE = 5;
+    int SOGROUPFILTERPAGE = 6;
+    int SOTITLESPAGE = 7;
+    int SOSUMMARYPAGE = 8;
+    Integer[] INTEGERS = new Integer[]
     {
         0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10
     };
diff --git a/wizards/com/sun/star/wizards/ui/event/EventNames.java b/wizards/com/sun/star/wizards/ui/event/EventNames.java
index fbb733f..e49ee30 100644
--- a/wizards/com/sun/star/wizards/ui/event/EventNames.java
+++ b/wizards/com/sun/star/wizards/ui/event/EventNames.java
@@ -19,21 +19,20 @@ package com.sun.star.wizards.ui.event;
 
 public interface EventNames
 {
-
     //common listener events
-    public static final String EVENT_ACTION_PERFORMED = "APR";
-    public static final String EVENT_ITEM_CHANGED = "ICH";
-    public static final String EVENT_TEXT_CHANGED = "TCH";    //window events (XWindow)
-    public static final String EVENT_WINDOW_RESIZED = "WRE";
-    public static final String EVENT_WINDOW_MOVED = "WMO";
-    public static final String EVENT_WINDOW_SHOWN = "WSH";
-    public static final String EVENT_WINDOW_HIDDEN = "WHI";    //focus events (XWindow)
-    public static final String EVENT_FOCUS_GAINED = "FGA";
-    public static final String EVENT_FOCUS_LOST = "FLO";    //keyboard events
-    public static final String EVENT_KEY_PRESSED = "KPR";
-    public static final String EVENT_KEY_RELEASED = "KRE";    //mouse events
-    public static final String EVENT_MOUSE_PRESSED = "MPR";
-    public static final String EVENT_MOUSE_RELEASED = "MRE";
-    public static final String EVENT_MOUSE_ENTERED = "MEN";
-    public static final String EVENT_MOUSE_EXITED = "MEX";    //other events
+    String EVENT_ACTION_PERFORMED = "APR";
+    String EVENT_ITEM_CHANGED = "ICH";
+    String EVENT_TEXT_CHANGED = "TCH";    //window events (XWindow)
+    String EVENT_WINDOW_RESIZED = "WRE";
+    String EVENT_WINDOW_MOVED = "WMO";
+    String EVENT_WINDOW_SHOWN = "WSH";
+    String EVENT_WINDOW_HIDDEN = "WHI";    //focus events (XWindow)
+    String EVENT_FOCUS_GAINED = "FGA";
+    String EVENT_FOCUS_LOST = "FLO";    //keyboard events
+    String EVENT_KEY_PRESSED = "KPR";
+    String EVENT_KEY_RELEASED = "KRE";    //mouse events
+    String EVENT_MOUSE_PRESSED = "MPR";
+    String EVENT_MOUSE_RELEASED = "MRE";
+    String EVENT_MOUSE_ENTERED = "MEN";
+    String EVENT_MOUSE_EXITED = "MEX";    //other events
 }