3:32 p.m.
Author: nkinder
Update of /cvs/dirsec/console/src/com/netscape/management/client
In directory
cvs-int.fedora.redhat.com:/tmp/cvs-serv1397/src/com/netscape/management/client
Modified Files:
AboutDialog.java Framework.java FrameworkInitializer.java
default.properties defaultLicense.properties
Log Message:
Resolves: 246270
Summary: Remove server root concept from Console.
Index: AboutDialog.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/AboutDialog.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AboutDialog.java 29 Sep 2006 17:17:20 -0000 1.6
+++ AboutDialog.java 29 Jun 2007 20:32:27 -0000 1.7
@@ -165,24 +165,4 @@
super.show();
}
-
-
- //testing program
- /*public static void main(String arg[]) {
-
- JFrame f = new JFrame();
- f.setSize(432,400);
-
- try {
-
UIManager.setLookAndFeel("com.netscape.management.nmclf.SuiLookAndFeel");
- } catch (Exception e) {}
-
-
- AboutDialog dialog = new AboutDialog(f, "Fedora Management Console");
- dialog.setProduct(UIManager.getIcon("OptionPane.warningIcon"),
"Fedora Management Console\056 Console 1.0.3\nCopyright (C) Red Hat, Inc.",
"\n\nThis software is subject to the terms of a license agreement. Please do not use
the software unless you agree to all the license terms");
- dialog.addVendor(UIManager.getIcon("OptionPane.informationIcon"),
"Contains Phaos SSL encryption software from Phaos Technology Corporation. Copyright
© 1998 Phaos Technology Corporation. All Rights Reserved");
- dialog.addVendor(UIManager.getIcon("OptionPane.informationIcon"),
"Contains encryption software from RSA Data Security, Inc. Copyright © 1994
RSA Data Security, Inc. All rights reserved.");
-
- dialog.show();
-}*/
}
Index: Framework.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/Framework.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Framework.java 24 Mar 2006 01:04:07 -0000 1.2
+++ Framework.java 29 Jun 2007 20:32:27 -0000 1.3
@@ -82,6 +82,8 @@
public static String _imageSource =
"com/netscape/management/client/images/";
public static ResourceSet _resource = new
ResourceSet("com.netscape.management.client.default");
+ public static ResourceSet _resource_theme = new
+ ResourceSet("com.netscape.management.client.theme.theme");
public static Help _help = new
Help("com.netscape.management.client.default");
protected boolean _isPageInitialized[];
@@ -208,7 +210,8 @@
2, HORIZ_WINDOW_INSET));
_bannerPanel = new JPanel(new BorderLayout());
-
_bannerPanel.getAccessibleContext().setAccessibleDescription(i18n("banner","console"));
+ _bannerPanel.getAccessibleContext().setAccessibleDescription(
+ _resource_theme.getString("banner","console"));
_bannerPanel.setBorder(
BorderFactory.createEmptyBorder(0, 0, 0, 0));
Index: FrameworkInitializer.java
===================================================================
RCS file:
/cvs/dirsec/console/src/com/netscape/management/client/FrameworkInitializer.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- FrameworkInitializer.java 18 Jul 2005 00:34:07 -0000 1.1.1.1
+++ FrameworkInitializer.java 29 Jun 2007 20:32:27 -0000 1.2
@@ -261,15 +261,16 @@
new Cursor(Cursor.WAIT_CURSOR));
if (aboutDialog == null) {
ResourceSet aboutDialogResource = new
ResourceSet("com.netscape.management.client.defaultLicense");
+ ResourceSet themeResource = new
ResourceSet("com.netscape.management.client.theme.theme");
aboutDialog = new AboutDialog(parent,
- aboutDialogResource.getString("defaultAbout",
+ themeResource.getString("defaultAbout",
"dialogTitle"));
aboutDialog.setProduct( new RemoteImage(
- aboutDialogResource.getString("defaultAbout",
+ themeResource.getString("defaultAbout",
"productLogo")),
aboutDialogResource.getString("defaultAbout",
"productCopyright"),
- aboutDialogResource.getString("defaultAbout",
+ themeResource.getString("defaultAbout",
"productLicense"));
StringTokenizer st = new StringTokenizer(
Index: default.properties
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/default.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- default.properties 13 Jun 2007 20:33:08 -0000 1.6
+++ default.properties 29 Jun 2007 20:32:27 -0000 1.7
@@ -123,5 +123,3 @@
fontTab-fontProfile=Font Profile
fontTab-table_tt=Font table of screen elements and corresponding sample font
-#banner-console=Fedora Management Console 1.0.3
-
Index: defaultLicense.properties
===================================================================
RCS file:
/cvs/dirsec/console/src/com/netscape/management/client/defaultLicense.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- defaultLicense.properties 13 Jun 2007 20:33:08 -0000 1.6
+++ defaultLicense.properties 29 Jun 2007 20:32:27 -0000 1.7
@@ -17,9 +17,6 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# END COPYRIGHT BLOCK
#
-#defaultAbout-dialogTitle=Fedora Management Console 1.0.3
-#defaultAbout-productLogo=com/netscape/management/client/images/logo32.gif
-defaultAbout-productCopyright=Copyright (C) 2001 Sun Microsystems, Inc. Used by
permission.\nCopyright (C) 2005 Red Hat, Inc.\nAll rights reserved.
-#defaultAbout-productLicense=Fedora is a trademark of Red Hat, Inc. in the United States
and other countries and is used by permission.
+defaultAbout-productCopyright=Copyright (C) 2001 Sun Microsystems, Inc. Used by
permission.\nCopyright (C) 2007 Red Hat, Inc.\nAll rights reserved.
defaultAbout-vendorsList=sun
defaultAbout-vendor-sun-license=Java is a trademark or registered trademark of Sun
Microsystems, Inc in the United States and other countries.\n\nJavaScript is a trademark
of Sun Microsystems, Inc. used under license for technology invented and implemented by
Netscape.