Remove currently unused cruft from OOPHM interface.
Patch by: jat
Review by: jlabanca (desk)
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@5870 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/dev/oophm/overlay/com/google/gwt/dev/shell/ShellMainWindow.java b/dev/oophm/overlay/com/google/gwt/dev/shell/ShellMainWindow.java
index c2d10dc..6a94906 100644
--- a/dev/oophm/overlay/com/google/gwt/dev/shell/ShellMainWindow.java
+++ b/dev/oophm/overlay/com/google/gwt/dev/shell/ShellMainWindow.java
@@ -35,22 +35,26 @@
public ShellMainWindow(TreeLogger.Type maxLevel) {
super(new BorderLayout());
- JPanel panel = new JPanel(new GridLayout(2, 1));
- JPanel optionPanel = new JPanel();
- optionPanel.setBorder(BorderFactory.createTitledBorder("Options"));
- optionPanel.add(new JLabel("Miscellaneous options here"));
- panel.add(optionPanel);
- JPanel launchPanel = new JPanel();
- launchPanel.setBorder(BorderFactory.createTitledBorder("Launch GWT Module"));
- launchPanel.add(new JLabel("Selections for launching a new module on a selected browser"));
- panel.add(launchPanel);
- add(panel, BorderLayout.NORTH);
+ // TODO(jat): add back when we have real options
+ if (false) {
+ JPanel panel = new JPanel(new GridLayout(2, 1));
+ JPanel optionPanel = new JPanel();
+ optionPanel.setBorder(BorderFactory.createTitledBorder("Options"));
+ optionPanel.add(new JLabel("Miscellaneous options here"));
+ panel.add(optionPanel);
+ JPanel launchPanel = new JPanel();
+ launchPanel.setBorder(BorderFactory.createTitledBorder("Launch GWT Module"));
+ launchPanel.add(new JLabel(
+ "Selections for launching a new module on a selected browser"));
+ panel.add(launchPanel);
+ add(panel, BorderLayout.NORTH);
+ }
logWindow = new SwingLoggerPanel(maxLevel);
add(logWindow);
}
/**
- * @return
+ * @return TreeLogger instance
*/
public AbstractTreeLogger getLogger() {
return logWindow.getLogger();
diff --git a/dev/oophm/src/com/google/gwt/dev/ModulePanel.java b/dev/oophm/src/com/google/gwt/dev/ModulePanel.java
index 4253aa9..fcf905c 100644
--- a/dev/oophm/src/com/google/gwt/dev/ModulePanel.java
+++ b/dev/oophm/src/com/google/gwt/dev/ModulePanel.java
@@ -34,6 +34,7 @@
import javax.swing.JTabbedPane;
/**
+ * A panel which represents a single module session.
*/
public class ModulePanel extends JPanel {
@@ -62,12 +63,16 @@
}
}
+ @SuppressWarnings("deprecation")
private static ImageIcon firefoxIcon = GWTShell.loadImageIcon("firefox24.png");
+ @SuppressWarnings("deprecation")
private static ImageIcon ieIcon = GWTShell.loadImageIcon("ie24.png");
+ @SuppressWarnings("deprecation")
private static ImageIcon safariIcon = GWTShell.loadImageIcon("safari24.png");
+ @SuppressWarnings("deprecation")
private static ImageIcon closeIcon = GWTShell.loadImageIcon("close.png");
private SwingLoggerPanel loggerPanel;
@@ -81,16 +86,18 @@
super(new BorderLayout());
this.tabs = tabs;
topPanel = new JPanel();
- topPanel.add(new JLabel(moduleName));
- JButton compileButton = new JButton("Compile (not yet implemented)");
- compileButton.setEnabled(false);
- compileButton.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- JOptionPane.showMessageDialog(null, "Compiling not implemented yet",
- "Alert: Not Implemented", JOptionPane.INFORMATION_MESSAGE);
- }
- });
- topPanel.add(compileButton);
+ topPanel.add(new JLabel("Module: " + moduleName));
+ if (false) {
+ JButton compileButton = new JButton("Compile (not yet implemented)");
+ compileButton.setEnabled(false);
+ compileButton.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ JOptionPane.showMessageDialog(null, "Compiling not implemented yet",
+ "Alert: Not Implemented", JOptionPane.INFORMATION_MESSAGE);
+ }
+ });
+ topPanel.add(compileButton);
+ }
add(topPanel, BorderLayout.NORTH);
loggerPanel = new SwingLoggerPanel(maxLevel);
add(loggerPanel);
diff --git a/dev/oophm/src/com/google/gwt/dev/shell/log/SwingLoggerPanel.java b/dev/oophm/src/com/google/gwt/dev/shell/log/SwingLoggerPanel.java
index 32e13d3..fe459f5 100644
--- a/dev/oophm/src/com/google/gwt/dev/shell/log/SwingLoggerPanel.java
+++ b/dev/oophm/src/com/google/gwt/dev/shell/log/SwingLoggerPanel.java
@@ -269,10 +269,8 @@
}
});
topPanel.add(collapsButton);
- if (true) {
- // temporarily avoid showing parts that aren't implemented.
- topPanel.add(new JLabel("Log filtering controls will go here"));
- } else {
+ // TODO(jat): temporarily avoid showing parts that aren't implemented.
+ if (false) {
topPanel.add(new JLabel("Filter Log Messages: "));
levelComboBox = new JComboBox();
for (TreeLogger.Type type : TreeLogger.Type.instances()) {
