You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2008/05/30 15:37:54 UTC
svn commit: r661714 - in
/directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds:
ApacheDsPluginConstants.java ApacheDsPluginUtils.java
prefs/ServerLogsPage.java
Author: pamarcelot
Date: Fri May 30 06:37:54 2008
New Revision: 661714
URL: http://svn.apache.org/viewvc?rev=661714&view=rev
Log:
Inverted the order of logs level.
Modified:
directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginConstants.java
directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginUtils.java
directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/prefs/ServerLogsPage.java
Modified: directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginConstants.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginConstants.java?rev=661714&r1=661713&r2=661714&view=diff
==============================================================================
--- directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginConstants.java (original)
+++ directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginConstants.java Fri May 30 06:37:54 2008
@@ -91,10 +91,10 @@
/** The Preference ID for the Servers Logs Level setting */
public static final String PREFS_SERVER_LOGS_LEVEL = "org.apache.directory.studio.apacheds.prefs.serverLogs.level";
- /** The Preference ID for the Servers Logs Level Info value */
- public static final String PREFS_SERVER_LOGS_LEVEL_INFO = "info";
/** The Preference ID for the Servers Logs Level Debug value */
public static final String PREFS_SERVER_LOGS_LEVEL_DEBUG = "debug";
+ /** The Preference ID for the Servers Logs Level Info value */
+ public static final String PREFS_SERVER_LOGS_LEVEL_INFO = "info";
/** The Preference ID for the Servers Logs Level Warn value */
public static final String PREFS_SERVER_LOGS_LEVEL_WARN = "warning";
/** The Preference ID for the Servers Logs Level Error value */
Modified: directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginUtils.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginUtils.java?rev=661714&r1=661713&r2=661714&view=diff
==============================================================================
--- directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginUtils.java (original)
+++ directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginUtils.java Fri May 30 06:37:54 2008
@@ -407,13 +407,13 @@
{
String level = ApacheDsPlugin.getDefault().getPreferenceStore().getString(
ApacheDsPluginConstants.PREFS_SERVER_LOGS_LEVEL );
- if ( ApacheDsPluginConstants.PREFS_SERVER_LOGS_LEVEL_INFO.equalsIgnoreCase( level ) )
+ if ( ApacheDsPluginConstants.PREFS_SERVER_LOGS_LEVEL_DEBUG.equalsIgnoreCase( level ) )
{
- return "INFO";
+ return "DEBUG";
}
- else if ( ApacheDsPluginConstants.PREFS_SERVER_LOGS_LEVEL_DEBUG.equalsIgnoreCase( level ) )
+ else if ( ApacheDsPluginConstants.PREFS_SERVER_LOGS_LEVEL_INFO.equalsIgnoreCase( level ) )
{
- return "DEBUG";
+ return "INFO";
}
else if ( ApacheDsPluginConstants.PREFS_SERVER_LOGS_LEVEL_WARN.equalsIgnoreCase( level ) )
{
Modified: directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/prefs/ServerLogsPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/prefs/ServerLogsPage.java?rev=661714&r1=661713&r2=661714&view=diff
==============================================================================
--- directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/prefs/ServerLogsPage.java (original)
+++ directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/prefs/ServerLogsPage.java Fri May 30 06:37:54 2008
@@ -110,8 +110,8 @@
// Level Combo
levelCombo = new Combo( logLevelGroup, SWT.DROP_DOWN | SWT.READ_ONLY | SWT.SIMPLE );
- levelCombo.add( "Info", 0 );
- levelCombo.add( "Debug", 1 );
+ levelCombo.add( "Debug", 0 );
+ levelCombo.add( "Info", 1 );
levelCombo.add( "Warning", 2 );
levelCombo.add( "Error", 3 );
levelCombo.add( "Fatal", 4 );
@@ -177,11 +177,11 @@
// Level
String level = store.getString( ApacheDsPluginConstants.PREFS_SERVER_LOGS_LEVEL );
- if ( ApacheDsPluginConstants.PREFS_SERVER_LOGS_LEVEL_INFO.equalsIgnoreCase( level ) )
+ if ( ApacheDsPluginConstants.PREFS_SERVER_LOGS_LEVEL_DEBUG.equalsIgnoreCase( level ) )
{
levelCombo.select( 0 );
}
- else if ( ApacheDsPluginConstants.PREFS_SERVER_LOGS_LEVEL_DEBUG.equalsIgnoreCase( level ) )
+ else if ( ApacheDsPluginConstants.PREFS_SERVER_LOGS_LEVEL_INFO.equalsIgnoreCase( level ) )
{
levelCombo.select( 1 );
}
@@ -212,11 +212,11 @@
// Level
String level = store.getDefaultString( ApacheDsPluginConstants.PREFS_SERVER_LOGS_LEVEL );
- if ( ApacheDsPluginConstants.PREFS_SERVER_LOGS_LEVEL_INFO.equalsIgnoreCase( level ) )
+ if ( ApacheDsPluginConstants.PREFS_SERVER_LOGS_LEVEL_DEBUG.equalsIgnoreCase( level ) )
{
levelCombo.select( 0 );
}
- else if ( ApacheDsPluginConstants.PREFS_SERVER_LOGS_LEVEL_DEBUG.equalsIgnoreCase( level ) )
+ else if ( ApacheDsPluginConstants.PREFS_SERVER_LOGS_LEVEL_INFO.equalsIgnoreCase( level ) )
{
levelCombo.select( 1 );
}
@@ -254,12 +254,12 @@
if ( level == 0 )
{
store.setValue( ApacheDsPluginConstants.PREFS_SERVER_LOGS_LEVEL,
- ApacheDsPluginConstants.PREFS_SERVER_LOGS_LEVEL_INFO );
+ ApacheDsPluginConstants.PREFS_SERVER_LOGS_LEVEL_DEBUG );
}
else if ( level == 1 )
{
store.setValue( ApacheDsPluginConstants.PREFS_SERVER_LOGS_LEVEL,
- ApacheDsPluginConstants.PREFS_SERVER_LOGS_LEVEL_DEBUG );
+ ApacheDsPluginConstants.PREFS_SERVER_LOGS_LEVEL_INFO );
}
else if ( level == 2 )
{