diff options
Diffstat (limited to 'java/src')
| -rwxr-xr-x | java/src/IceGridGUI/Coordinator.java | 37 | ||||
| -rwxr-xr-x | java/src/IceGridGUI/LicenseDialog.java | 82 |
2 files changed, 2 insertions, 117 deletions
diff --git a/java/src/IceGridGUI/Coordinator.java b/java/src/IceGridGUI/Coordinator.java index 16ebc4af5b6..b50ab366931 100755 --- a/java/src/IceGridGUI/Coordinator.java +++ b/java/src/IceGridGUI/Coordinator.java @@ -271,13 +271,7 @@ public class Coordinator add(helpMenu);
helpMenu.add(_helpContents);
- if(GPL_BUILD)
- {
- helpMenu.addSeparator();
- helpMenu.add(_copying);
- helpMenu.add(_warranty);
- }
-
+
helpMenu.addSeparator();
helpMenu.add(_about);
}
@@ -1242,8 +1236,6 @@ public class Coordinator _liveDeploymentRoot = new IceGridGUI.LiveDeployment.Root(this);
- _licenseDialog = new LicenseDialog(_mainFrame);
-
_sessionKeeper = new SessionKeeper(this);
_shutdownHook = new Thread("Shutdown hook")
@@ -1508,23 +1500,7 @@ public class Coordinator helpContents();
}
};
-
- _copying = new AbstractAction("Copying conditions")
- {
- public void actionPerformed(ActionEvent e)
- {
- _licenseDialog.show("TOP");
- }
- };
-
- _warranty = new AbstractAction("(Non)Warranty")
- {
- public void actionPerformed(ActionEvent e)
- {
- _licenseDialog.show("WARRANTY");
- }
- };
-
+
_about = new AbstractAction("About")
{
public void actionPerformed(ActionEvent e)
@@ -1896,8 +1872,6 @@ public class Coordinator private SessionKeeper _sessionKeeper;
private Object _clipboard;
-
- private LicenseDialog _licenseDialog;
//
// Actions
@@ -1920,8 +1894,6 @@ public class Coordinator private Action _back;
private Action _forward;
private Action _helpContents;
- private Action _copying;
- private Action _warranty;
private Action _about;
private Action _patchApplication;
@@ -1958,9 +1930,4 @@ public class Coordinator private String _fileParser;
static private final int HISTORY_MAX_SIZE = 20;
-
- //
- // TODO: should come from build system
- //
- static private final boolean GPL_BUILD = true;
}
diff --git a/java/src/IceGridGUI/LicenseDialog.java b/java/src/IceGridGUI/LicenseDialog.java deleted file mode 100755 index 303a6cf9e07..00000000000 --- a/java/src/IceGridGUI/LicenseDialog.java +++ /dev/null @@ -1,82 +0,0 @@ -// **********************************************************************
-//
-// Copyright (c) 2003-2006 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-package IceGridGUI;
-
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.awt.Frame;
-
-import java.awt.event.ActionEvent;
-
-import javax.swing.JDialog;
-import javax.swing.JEditorPane;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-
-import javax.swing.text.html.HTMLDocument;
-import javax.swing.text.html.HTMLFrameHyperlinkEvent;
-
-import javax.swing.event.HyperlinkEvent;
-import javax.swing.event.HyperlinkListener;
-
-import com.jgoodies.forms.factories.Borders;
-
-//
-// Shows Ice license and warranty
-//
-public class LicenseDialog extends JDialog
-{
- public LicenseDialog(Frame parentFrame)
- {
- super(parentFrame, "License - IceGrid Admin", false);
- setDefaultCloseOperation(JDialog.HIDE_ON_CLOSE);
-
- try
- {
- _pane = new JEditorPane(Utils.class.getResource("/license.html"));
- }
- catch(java.io.IOException e)
- {
- _pane = new JEditorPane();
- _pane.setText("Cannot find license.html");
- }
- _pane.setEditable(false);
-
- _pane.addHyperlinkListener(new HyperlinkListener()
- {
- public void hyperlinkUpdate(HyperlinkEvent e)
- {
- if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED)
- {
- _pane.scrollToReference(e.getURL().getRef());
- }
- }
- });
- Dimension prefSize = new Dimension(700, 500);
- _pane.setPreferredSize(prefSize);
-
- JScrollPane scrollPane = new JScrollPane(_pane);
- scrollPane.setBorder(Borders.DIALOG_BORDER);
- getContentPane().add(scrollPane, BorderLayout.CENTER);
- pack();
- }
-
-
- public void show(String ref)
- {
- setLocationRelativeTo(null);
- setVisible(true);
- _pane.scrollToReference(ref);
- }
-
- JEditorPane _pane;
-}
-
-
-
|