[Fedora-directory-commits] console/src/com/netscape/management/client/console Console.java, 1.1.1.1, 1.2 VersionInfo.java, 1.1.1.1, 1.2 console.properties, 1.2, 1.3

[Nathan Kinder (nkinder)]

Author: nkinder

Update of /cvs/dirsec/console/src/com/netscape/management/client/console
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26415/src/com/netscape/management/client/console

Modified Files:
	Console.java VersionInfo.java console.properties 
Log Message:
171830 - Change console version to 1.0


Index: Console.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/console/Console.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Console.java	18 Jul 2005 00:34:14 -0000	1.1.1.1
+++ Console.java	26 Oct 2005 23:16:23 -0000	1.2
@@ -58,7 +58,7 @@
     // preference information
     //
     public static final String IDENTIFIER = "Console";
-    public static final String VERSION = "4.0";
+    public static final String VERSION = "1.0";
     public static final String PREFERENCES_LOGIN =
             IDENTIFIER + "." + VERSION + ".Login.preferences";
 
@@ -76,8 +76,6 @@
 
 	public static final int MAX_RECENT_URLS = 5;
 
-	protected static final double MIN_CONTEXT_HELP_VERSION = 4.5;
-
     //
     // global values
     //
@@ -942,26 +940,10 @@
                     userPreferenceDN, true);
             _info.setUserPreferenceDN(userPreferenceDN);
         }
-		checkHelpSystem();
+        // Always enable context help.
+        UtilConsoleGlobals.setContextHelpEnabled( true );
     }
 
-	/**
-	 * Check if the Admin Server version supports context-sensitive
-	 * Help. That is the case if the version is greater than 4.2.
-	 */
-	protected void checkHelpSystem() {
-		boolean hasContextHelp = false;
-		if ( _adminVersion != null ) {
-			hasContextHelp = ( Double.parseDouble( _adminVersion ) >=
-							   MIN_CONTEXT_HELP_VERSION );
-			Debug.println( "Console.checkHelpSystem: contextHelp=" +
-						   hasContextHelp );
-		} else {
-			Debug.println( "Console.checkHelpSystem: cannot determine " +
-						   "Admin Version" );
-		}
-		UtilConsoleGlobals.setContextHelpEnabled( hasContextHelp );
-	}
 
     /**
       * build up the resource editor extension plugin.


Index: VersionInfo.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/console/VersionInfo.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- VersionInfo.java	18 Jul 2005 00:34:15 -0000	1.1.1.1
+++ VersionInfo.java	26 Oct 2005 23:16:23 -0000	1.2
@@ -32,33 +32,18 @@
     private static ResourceSet _resource = new ResourceSet("com.netscape.management.client.console.versioninfo");
 
     /**
-     * Returns version number for the Netacape Console
-     * VersionInfo class is introduces in Console 4.1. As 4.1 Netscape Servers
-     * may be started under 4.0 console as well, the proper way to test for
-     * version is:
-     * <pre>
-     *     String version, build;
-     *     try {
-     *         version = VersionInfo.getVersionNumber();
-     *     }
-     *     // If the class is not found then we are running in 4.0 environment
-     *     catch (ClassNotFoundException e) {
-     *         version = "4.0";
-     *     }
-     *     Debug.println("version="+version);
+     * Returns version number for the Console.
      *
-     * </pre>
-     *
-     * @return  Netscape Console Version Number
+     * @return  Console Version Number
      */
     public static String getVersionNumber() {
         return _resource.getString("console","versionNumber");
     }
 
     /**
-      * Returns build number for the Netacape Console.
+      * Returns build number for the Console.
       *
-      * @return  Netscape Console Build Number
+      * @return  Console Build Number
       */
     public static String getBuildNumber() {
         return _resource.getString("console","buildNumber");


Index: console.properties
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/console/console.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- console.properties	9 Sep 2005 20:29:09 -0000	1.2
+++ console.properties	26 Oct 2005 23:16:23 -0000	1.3
@@ -18,7 +18,7 @@
 # END COPYRIGHT BLOCK
 #
 console-title=Fedora Management Console
-console-displayVersion=7.1
+console-displayVersion=1.0
 
 login-username=User ID:
 login-password=Password: