[Jarspy-commits] CVS: JarSpy2/src/java/org/jarspy/gui JarSpyGUI.java,1.1.1.1,1.2

[Jeff B. <br...@us...>]

Update of /cvsroot/jarspy/JarSpy2/src/java/org/jarspy/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25514/src/java/org/jarspy/gui

Modified Files:
	JarSpyGUI.java 
Log Message:
use jgoodies

Index: JarSpyGUI.java
===================================================================
RCS file: /cvsroot/jarspy/JarSpy2/src/java/org/jarspy/gui/JarSpyGUI.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** JarSpyGUI.java	28 Jan 2005 02:49:15 -0000	1.1.1.1
--- JarSpyGUI.java	28 Jan 2005 04:26:29 -0000	1.2
***************
*** 19,38 ****
  package org.jarspy.gui;
  
- import org.jarspy.gui.util.Splasher;
  import org.jarspy.JarInspector;
! import org.jarspy.gui.actions.AboutAction;
! import org.jarspy.gui.actions.ActionNames;
! import org.jarspy.gui.actions.DecompileAction;
! import org.jarspy.gui.actions.ExitAction;
! import org.jarspy.gui.actions.ExtractArchiveAction;
! import org.jarspy.gui.actions.OpenArchiveAction;
! import org.jarspy.gui.actions.ViewJarContentsAction;
! import org.jarspy.gui.actions.ViewManifestAction;
  import org.jarspy.preferences.JarSpyPreferences;
  import org.jarspy.preferences.JarSpyPreferencesFactory;
! import java.awt.BorderLayout;
! import java.awt.Container;
! import java.awt.Dimension;
! import java.awt.Point;
  import java.awt.event.WindowListener;
  import java.io.File;
--- 19,30 ----
  package org.jarspy.gui;
  
  import org.jarspy.JarInspector;
! import org.jarspy.gui.actions.*;
! import org.jarspy.gui.util.Splasher;
  import org.jarspy.preferences.JarSpyPreferences;
  import org.jarspy.preferences.JarSpyPreferencesFactory;
! 
! import javax.swing.*;
! import java.awt.*;
  import java.awt.event.WindowListener;
  import java.io.File;
***************
*** 44,57 ****
  import java.util.Map;
  import java.util.jar.JarFile;
- import javax.swing.Action;
- import javax.swing.ImageIcon;
- import javax.swing.JFrame;
- import javax.swing.JMenu;
- import javax.swing.JMenuBar;
- import javax.swing.JMenuItem;
- import javax.swing.JOptionPane;
- import javax.swing.JToolBar;
- import javax.swing.SwingUtilities;
- import javax.swing.UIManager;
  
  /**
--- 36,39 ----
***************
*** 104,118 ****
          jarSpyPreferences = JarSpyPreferencesFactory.getPreferences();
  
-         String preferredLookAndFeelClassName =
-                 jarSpyPreferences.getPreferredLookAndFeel();
-         if (preferredLookAndFeelClassName != null) {
-             try {
-                 UIManager.setLookAndFeel(preferredLookAndFeelClassName);
-                 SwingUtilities.updateComponentTreeUI(this);
-             } catch (Exception e) {
-                 e.printStackTrace();
-             }
-         }
- 
          Point mainWindowLocation = jarSpyPreferences.getMainWindowPosition();
          setLocation(mainWindowLocation);
--- 86,89 ----
***************
*** 142,158 ****
      private void createActions() {
          actions.put(ActionNames.OPEN_ARCHIVE_ACTION,
!                     new OpenArchiveAction(this));
          actions.put(ActionNames.EXIT_ACTION,
!                     new ExitAction(this));
          actions.put(ActionNames.EXTRACT_ARCHIVE_ACTION,
!                     new ExtractArchiveAction(this, jarInspector));
          actions.put(ActionNames.VIEW_MANIFEST_ACTION,
!                     new ViewManifestAction(this, jarInspector));
          actions.put(ActionNames.ABOUT_ACTION,
!                     new AboutAction(this));
          actions.put(ActionNames.DECOMPILE_ACTION,
!                     new DecompileAction(this, jarInspector));
          actions.put(ActionNames.VIEW_JAR_CONTENTS_ACTION,
!                     new ViewJarContentsAction(this));
      }
  
--- 113,129 ----
      private void createActions() {
          actions.put(ActionNames.OPEN_ARCHIVE_ACTION,
!                 new OpenArchiveAction(this));
          actions.put(ActionNames.EXIT_ACTION,
!                 new ExitAction(this));
          actions.put(ActionNames.EXTRACT_ARCHIVE_ACTION,
!                 new ExtractArchiveAction(this, jarInspector));
          actions.put(ActionNames.VIEW_MANIFEST_ACTION,
!                 new ViewManifestAction(this, jarInspector));
          actions.put(ActionNames.ABOUT_ACTION,
!                 new AboutAction(this));
          actions.put(ActionNames.DECOMPILE_ACTION,
!                 new DecompileAction(this, jarInspector));
          actions.put(ActionNames.VIEW_JAR_CONTENTS_ACTION,
!                 new ViewJarContentsAction(this));
      }
  
***************
*** 278,282 ****
          jarSpyPreferences.saveMainWindowPosition(getLocation());
          jarSpyPreferences.saveMainWindowSize(getSize());
-         jarSpyPreferences.savePreferredLookAndFeel(UIManager.getLookAndFeel().getClass().getName());
          JarFile jarFile = jarInspector.getJarFile();
          if (jarFile != null) {
--- 249,252 ----
***************
*** 297,306 ****
          } catch (ClassNotFoundException e) {
              JOptionPane.showMessageDialog(null,
!                                           "JarSpy requires Java Runtime 1.3 or greater.",
!                                           "Incompatible VM",
!                                           JOptionPane.ERROR_MESSAGE);
              System.exit(0);
          }
  
          new JarSpyGUI(a.length > 0 ? a[0] : null);
      }
--- 267,277 ----
          } catch (ClassNotFoundException e) {
              JOptionPane.showMessageDialog(null,
!                     "JarSpy requires Java Runtime 1.3 or greater.",
!                     "Incompatible VM",
!                     JOptionPane.ERROR_MESSAGE);
              System.exit(0);
          }
  
+         UIManager.setLookAndFeel("com.jgoodies.plaf.plastic.PlasticXPLookAndFeel");
          new JarSpyGUI(a.length > 0 ? a[0] : null);
      }