# HG changeset patch
# User nolith
# Date 1181917335 -7200
# Branch trunk
# Node ID 4581103ec2ba103796c10c7decff5c92e9062207
# Parent  5f24ee46836c925571045892bd9958b2310c8bd6
[svn] Added windows deployment (does not work :( )
Now you can generate fatjar that works on each platform
Platform L&F
Added About windows
Some general L&F improvement
You can use keyboard for confirm end escape in DialogPassword
Menu->check file now works
Preferences->browse enabled

Ant file has now a customization file for environmnet specific settings

diff -r 5f24ee46836c925571045892bd9958b2310c8bd6 -r 4581103ec2ba103796c10c7decff5c92e9062207 ant/launch4j.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ant/launch4j.xml	Fri Jun 15 16:22:15 2007 +0200
@@ -0,0 +1,17 @@
+<launch4jConfig>
+  <headerType>0</headerType>
+  <errTitle>PortableNotary</errTitle>
+  <jarArgs></jarArgs>
+  <chdir></chdir>
+  <customProcName>true</customProcName>
+  <stayAlive>false</stayAlive>
+  <icon></icon>
+  <jre>
+    <path></path>
+    <minVersion>1.5.0</minVersion>
+    <maxVersion></maxVersion>
+    <initialHeapSize>0</initialHeapSize>
+    <maxHeapSize>0</maxHeapSize>
+    <args></args>
+  </jre>
+</launch4jConfig>
\ No newline at end of file
diff -r 5f24ee46836c925571045892bd9958b2310c8bd6 -r 4581103ec2ba103796c10c7decff5c92e9062207 ant/one-jar-ant-task.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ant/one-jar-ant-task.xml	Fri Jun 15 16:22:15 2007 +0200
@@ -0,0 +1,19 @@
+<project name="one-jar" >
+<target name="one-jar" depends="build">
+        <!-- Construct the One-JAR file -->   
+        <one-jar destfile="hello.jar" manifest="hello.mf">
+            <main>
+                <!-- Construct main.jar from classes and source code -->
+                <fileset dir="${build}"/>
+            </main>
+            <lib>
+                <fileset dir="${libs}" includes="*.jar"/>
+            </lib>
+        </one-jar>
+        <echo>
+          Now you can run the Hello One-JAR example using 
+          $ java -jar hello.jar
+        </echo>   
+           
+ </target>
+ </project>
\ No newline at end of file
diff -r 5f24ee46836c925571045892bd9958b2310c8bd6 -r 4581103ec2ba103796c10c7decff5c92e9062207 ant/user_pref.xml.template
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ant/user_pref.xml.template	Fri Jun 15 16:22:15 2007 +0200
@@ -0,0 +1,16 @@
+<!-- rename to user_pref.xml and customize -->
+<project name="user preferences">
+	<property name="src" value="./src"/>
+	<property name="src.right" value="./source"/>
+	<property name="build" value="./bin"/>
+	<property name="release" value="./release"/>
+	<property name="libs" value="./libs"/>
+	<property name="main.class" value="org.abisso.PortableNotary.PortableNotary"/>
+	<property name="out.jar" value="./PortableNotary.jar"/>
+	<property name="out.fatjar" value="${release}/PortableNotary.jar"/>
+	<property name="itext" value="${libs}/itext-2.0.4.jar"/>
+	<property name="commons-cli" value="${libs}/commons-cli-1.0.jar"/>
+	<property name="bcprov" value="${libs}/bcprov-jdk15-136.jar"/>
+	<property name="compile.debug"			 value="true"/>
+  <property name="launch4j.dir" location="C:/Programmi/launch4j" />
+</project>
\ No newline at end of file
diff -r 5f24ee46836c925571045892bd9958b2310c8bd6 -r 4581103ec2ba103796c10c7decff5c92e9062207 build.xml
--- a/build.xml	Fri Jun 15 09:37:18 2007 +0200
+++ b/build.xml	Fri Jun 15 16:22:15 2007 +0200
@@ -3,16 +3,17 @@
 <!-- Created by: Alessio Caiazza &lt;ac@abisso.org&gt;	-->
 
 <project name="PortableNotary" default="build" basedir=".">
-	<property name="src" value="./src"/>
-	<property name="src.right" value="./source"/>
-	<property name="build" value="./bin"/>
-	<property name="libs" value="./libs"/>
-	<property name="main.class" value="org.abisso.PortableNotary.PortableNotary"/>
-	<property name="out.jar" value="./PortableNotary.jar"/>
-	<property name="itext" value="${libs}/itext-2.0.4.jar"/>
-	<property name="commons-cli" value="${libs}/commons-cli-1.0.jar"/>
-	<property name="bcprov" value="${libs}/bcprov-jdk15-136.jar"/>
-	<property name="compile.debug"			 value="true"/>
+	<import file="ant/user_pref.xml"/>
+  <!-- uncomment the following lines if using ANT outside Eclipse -->
+  <!--
+      <property name="fjepPath" value="plugins/net.sf.fjep.fatjar_0.0.25/fatjar.jar"/>
+      <taskdef name="fatjar.build" classname="net.sf.fjep.anttask.FJBuildTask" classpath="${fjepPath}"/>
+      <typedef name="fatjar.manifest" classname="net.sf.fjep.anttask.FJManifestType" classpath="${fjepPath}"/>
+      <typedef name="fatjar.exclude" classname="net.sf.fjep.anttask.FJExcludeType" classpath="${fjepPath}"/>
+      <typedef name="fatjar.jarsource" classname="net.sf.fjep.anttask.FJJarSourceType" classpath="${fjepPath}"/>
+      <typedef name="fatjar.filesource" classname="net.sf.fjep.anttask.FJFileSourceType" classpath="${fjepPath}"/>
+  -->
+  <!-- uncomment the above lines to use ANT outside of Eclipse -->
 	<!-- trick for legacy JVM -->
 	<condition property="source.version" value="1.6" else="1.5">
 		<equals arg1="${java5}" arg2="false"/>
@@ -22,12 +23,12 @@
 	</condition>
 	<condition property="enddef.token" value="*/" else="">
 		<equals arg1="${java5}" arg2="false"/>
-	</condition>
+	</condition> 
 	
 	<!-- http://informagen.com/JarBundler/ -->
 	<taskdef name="jarbundler" 
 	         classname="net.sourceforge.jarbundler.JarBundler" />
-	<property name="launch4j.dir" location="/Developer/Java/launch4j" />
+	
 	<taskdef name="launch4j"
 	    classname="net.sf.launch4j.ant.Launch4jTask"
 	    classpath="${launch4j.dir}/launch4j.jar
@@ -80,7 +81,7 @@
 		does not already exist.
 	-->
 	<target name="init">
-		<mkdir dir="./release"/>
+		<mkdir dir="${release}"/>
 		<mkdir dir="${build}"/>
 		<mkdir dir="${src.right}"/>
 		<copy todir="${src.right}">
@@ -98,7 +99,7 @@
 	<target name="run" depends="build">
 		<java classname="${main.class}"	
 			fork="true" 
-			dir="${build}" 
+			dir="." 
 			classpath="${build}" 
 			maxmemory="500m">
 			<classpath refid="classpath"/>
@@ -115,7 +116,7 @@
 		<delete verbose="true">
 			<fileset dir="${build}"/>
 			<fileset dir="${src.right}"/>
-			<fileset dir="./release"/>
+			<fileset dir="${release}"/>
 		</delete>
 	</target>
 
@@ -133,13 +134,18 @@
 	</target>
 	
 	
-	<target name="deploy-generic" depends="jar">
-		<zip destfile="release/PortableNotary.zip" >
-			<zipfileset dir="." includes="*.jar" />
-			<zipfileset dir="images" includes="*.png" prefix="images"/>
-			<zipfileset dir="libs" includes="*.jar" prefix="libs"/>	
-		</zip>	
-	</target>
+  <target name="deploy-generic" depends="build">
+      <fatjar.build output="${out.fatjar}">
+          <fatjar.manifest mainclass="${main.class}"/>
+          <fatjar.filesource path="${build}" relpath="">
+              <fatjar.exclude relpath=".svn/"/>
+          </fatjar.filesource>
+          <fatjar.jarsource file="${itext}" relpath=""/>
+          <fatjar.jarsource file="${commons-cli}" relpath=""/>
+          <fatjar.jarsource file="${bcprov}" relpath=""/>
+          <fatjar.filesource path="./images/Icon.png" relpath="images/Icon.png"/>
+      </fatjar.build>
+  </target>
 
 	<target name="deploy-osx" depends="jar">
 		<jarbundler dir="release"
@@ -158,6 +164,10 @@
 		</jarbundler>
 	</target>
 	
+	<target name="deploy-win" depends="deploy-generic">
+		<launch4j configFile="./ant/launch4j.xml" jarPath="../${out.fatjar}" outfile="../${release}/PortableNotary.exe" />
+	</target>
+	
 	<target name="deploy" depends="deploy-osx, deploy-generic" />
 
 </project>
diff -r 5f24ee46836c925571045892bd9958b2310c8bd6 -r 4581103ec2ba103796c10c7decff5c92e9062207 src/org/abisso/PortableNotary/GUI/About.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/abisso/PortableNotary/GUI/About.java	Fri Jun 15 16:22:15 2007 +0200
@@ -0,0 +1,112 @@
+/**
+ PortableNotary - About.java
+ Copyright 2007 Alessio Caiazza <nolith@abisso.org>
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+package org.abisso.PortableNotary.GUI;
+
+import java.awt.BorderLayout;
+import javax.swing.JPanel;
+import javax.swing.JFrame;
+import javax.swing.JTextPane;
+import javax.swing.JLabel;
+
+import org.abisso.PortableNotary.Messages;
+import org.abisso.PortableNotary.PortableNotary;
+import javax.swing.WindowConstants;
+
+/**
+ * @author nolith
+ *
+ */
+public class About extends JFrame {
+
+	private static final long serialVersionUID = 1L;
+
+	private JPanel jContentPane = null;
+
+	private JTextPane body = null;
+
+	private JLabel copyright = null;
+
+	/**
+	 * This is the default constructor
+	 */
+	public About() {
+		super();
+		initialize();
+	}
+
+	/**
+	 * This method initializes this
+	 * 
+	 * @return void
+	 */
+	private void initialize() {
+		this.setSize(481, 292);
+		this.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
+		this.setContentPane(getJContentPane());
+		this.setTitle("About");
+	}
+
+	/**
+	 * This method initializes jContentPane
+	 * 
+	 * @return javax.swing.JPanel
+	 */
+	private JPanel getJContentPane() {
+		if (jContentPane == null) {
+			copyright = new JLabel();
+			copyright.setText("(c) Alessio Caiazza <nolith@abisso.org>");
+			jContentPane = new JPanel();
+			jContentPane.setLayout(new BorderLayout());
+			jContentPane.add(getBody(), BorderLayout.CENTER);
+			jContentPane.add(copyright, BorderLayout.SOUTH);
+		}
+		return jContentPane;
+	}
+
+	/**
+	 * This method initializes body	
+	 * 	
+	 * @return javax.swing.JTextPane	
+	 */
+	private JTextPane getBody() {
+		if (body == null) {
+			body = new JTextPane();
+			body.setContentType("text/html");
+			body.setEditable(false);
+			String out = "<html><body>\n<p style=\"margin-top: 0\">";
+			out +=	"PortableNotary " + Messages.getString("PortableNotary.Version") + 
+					" " + PortableNotary.VERSION + 
+					" &copy; Alessio Caiazza " +
+					"<a href=\"mailto:nolith@abisso.org\">nolith@abisso.org</a><br>" ;
+			out+= Messages.getString("PortableNotary.MyLicense") + "<br>"; //$NON-NLS-1$
+			out+= Messages.getString("PortableNotary.LibraryList"); //$NON-NLS-1$
+			out += "<ul>\n";
+			out+="<li> common-cli : <a href=\"http://jakarta.apache.org/commons/cli/\">" +
+					"http://jakarta.apache.org/commons/cli/</a> " + //$NON-NLS-1$
+					Messages.getString("PortableNotary.ReleasedUnder") + " Apache Licence V2</li>"; //$NON-NLS-1$ //$NON-NLS-2$
+			out+="<li> iText : <a href=\"http://www.lowagie.com/iText/\">http://www.lowagie.com/iText/</a> " + //$NON-NLS-1$
+					Messages.getString("PortableNotary.ReleasedUnder") + " LGPL/MPL</li>"; //$NON-NLS-1$ //$NON-NLS-2$
+			out+="<li> Bouncy Castle Crypto APIs : <a href=\"http://www.bouncycastle.org/java.html\">" +
+				"http://www.bouncycastle.org/java.html</a> " + //$NON-NLS-1$
+					Messages.getString("PortableNotary.ReleasedUnder") + " AS-IS</li>"; //$NON-NLS-1$ //$NON-NLS-2$
+			out+="</ul></p>\n<em>see you space cowboy...</em>"; //$NON-NLS-1$
+			body.setText(out + "\n</body></html>");
+		}
+		return body;
+	}
+
+}  //  @jve:decl-index=0:visual-constraint="10,10"
diff -r 5f24ee46836c925571045892bd9958b2310c8bd6 -r 4581103ec2ba103796c10c7decff5c92e9062207 src/org/abisso/PortableNotary/GUI/ImagePanel.java
--- a/src/org/abisso/PortableNotary/GUI/ImagePanel.java	Fri Jun 15 09:37:18 2007 +0200
+++ b/src/org/abisso/PortableNotary/GUI/ImagePanel.java	Fri Jun 15 16:22:15 2007 +0200
@@ -20,8 +20,9 @@
 import java.awt.Graphics;
 import java.awt.Image;
 import java.awt.MediaTracker;
-import java.awt.Toolkit;
+import java.net.URL;
 
+import javax.swing.ImageIcon;
 import javax.swing.JPanel;
 
 public class ImagePanel extends JPanel
@@ -33,7 +34,10 @@
 
 	public ImagePanel(String path)
 	{
-		image = Toolkit.getDefaultToolkit().getImage(path);
+		URL imgURL = ImagePanel.class.getResource(path);
+
+		image = new ImageIcon(imgURL).getImage();
+		//image = Toolkit.getDefaultToolkit().getImage(path);
 		MediaTracker tracker = new MediaTracker(this);
 		tracker.addImage(image, 0);
 		try
diff -r 5f24ee46836c925571045892bd9958b2310c8bd6 -r 4581103ec2ba103796c10c7decff5c92e9062207 src/org/abisso/PortableNotary/GUI/MainFrame.java
--- a/src/org/abisso/PortableNotary/GUI/MainFrame.java	Fri Jun 15 09:37:18 2007 +0200
+++ b/src/org/abisso/PortableNotary/GUI/MainFrame.java	Fri Jun 15 16:22:15 2007 +0200
@@ -20,12 +20,14 @@
 import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.io.File;
 
+import javax.swing.JFileChooser;
 import javax.swing.JFrame;
+import javax.swing.JLabel;
 import javax.swing.JMenu;
 import javax.swing.JMenuBar;
 import javax.swing.JMenuItem;
-import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 
 import net.iharder.dnd.FileDrop;
@@ -43,6 +45,7 @@
 	private JMenu file = null;
 	private JMenuItem checkFile = null;
 	private JMenuItem exit = null;
+	private JMenuItem about = null;
 	private JMenu option = null;
 	private JMenuItem preferences = null;
 
@@ -78,25 +81,7 @@
 		new  FileDrop( getImage(), new FileDrop.Listener(){
 			public void  filesDropped( java.io.File[] files )
 			{   
-				MyFrameWithConsole sign;
-				
-				//check if password is stored
-				String password = pref.getKeystore_pass();
-				System.out.println(password);
-				if ( password.equals("") ) {
-					password = PasswordDialog.askPassword(null);
-				}
-				System.out.println(password);
-				for( int i=0; i<files.length; i++) {
-					sign = new MyFrameWithConsole(files[i].getName());
-					sign.setVisible(true);
-					Notary.setOutStream(sign.getWriter());
-					//Notary.check(files[i].getAbsolutePath());
-					Notary.check(pref.getKeystore_path(),
-							files[i].getAbsolutePath(), 
-							password.toCharArray(), 
-							false);
-				}
+				check(files);
 			}
 		}); // end FileDrop.Listener
 	}
@@ -107,6 +92,19 @@
 			file = new JMenu("File");
 			option = new JMenu("Options");
 			checkFile = new JMenuItem("Check file");
+			checkFile.addActionListener(new java.awt.event.ActionListener() {
+				public void actionPerformed(java.awt.event.ActionEvent e) {
+					JFileChooser fc = new JFileChooser();
+					fc.setDialogType(JFileChooser.OPEN_DIALOG);
+					int returnVal = fc.showOpenDialog(MainFrame.this);
+
+			        if (returnVal == JFileChooser.APPROVE_OPTION) {
+			            File file = fc.getSelectedFile();
+
+			            check( new File[]{file,  });
+			        }
+				}
+			});
 			exit = new JMenuItem("Quit");
 			exit.addActionListener(new ActionListener() {
 				public void actionPerformed(ActionEvent e) {
@@ -116,16 +114,25 @@
 			preferences = new JMenuItem("Preferences");
 			preferences.addActionListener(new ActionListener() {
 				public void actionPerformed(ActionEvent e) {
-					//TODO: shoul be a modal window!
 					PreferencesDialog pWin = new PreferencesDialog(pref);
 					pWin.setVisible(true);
 				}	
 			});
+			about = new JMenuItem("About");
+			about.addActionListener(new ActionListener() {
+				public void actionPerformed(ActionEvent e) {
+					About a = new About();
+					a.setVisible(true);
+				}		
+			});
+			JMenu interr = new JMenu("?");
 			option.add(preferences);
 			file.add(checkFile);
 			file.add(exit);
+			interr.add(about);
 			menubar.add(file);
 			menubar.add(option);
+			menubar.add(interr);
 		}
 		return menubar;
 	}
@@ -151,11 +158,39 @@
 	 */
 	private JPanel getImage() {
 		if (Image == null) {
-			Image = new ImagePanel("images/Icon.png");
+			try {
+			Image = new ImagePanel("/images/Icon.png");
 			Image.setLayout(new GridBagLayout());
 			Image.setToolTipText("Drag Here your PDF file");
+			}catch (NullPointerException e) {
+				Image = new JPanel();
+				Image.add(new JLabel("<html><h1>Development Mode</h1>" +
+						"<br><h3>Drag file HERE</h3>"+"</html>"));
+			}
 		}
 		return Image;
 	}
 
+	/**
+	 * @param files
+	 */
+	private void check(java.io.File[] files) {
+		MyFrameWithConsole sign;
+		
+		//check if password is stored
+		String password = pref.getKeystore_pass();
+		if ( password.equals("") ) {
+			password = PasswordDialog.askPassword(MainFrame.this);
+		}
+		for( int i=0; i<files.length; i++) {
+			sign = new MyFrameWithConsole(files[i].getName());
+			sign.setVisible(true);
+			Notary.setOutStream(sign.getWriter());
+			Notary.check(pref.getKeystore_path(),
+					files[i].getAbsolutePath(), 
+					password.toCharArray(), 
+					false);
+		}
+	}
+
 }
diff -r 5f24ee46836c925571045892bd9958b2310c8bd6 -r 4581103ec2ba103796c10c7decff5c92e9062207 src/org/abisso/PortableNotary/GUI/PasswordDialog.java
--- a/src/org/abisso/PortableNotary/GUI/PasswordDialog.java	Fri Jun 15 09:37:18 2007 +0200
+++ b/src/org/abisso/PortableNotary/GUI/PasswordDialog.java	Fri Jun 15 16:22:15 2007 +0200
@@ -5,12 +5,12 @@
 import java.awt.Frame;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-
 import javax.swing.JButton;
 import javax.swing.JDialog;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JPasswordField;
+import javax.swing.WindowConstants;
 
 public class PasswordDialog extends JDialog {
 
@@ -49,6 +49,9 @@
 	 */
 	private void initialize() {
 		this.setSize(300, 130);
+		this.setResizable(false);
+		this.setModal(true);
+		this.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
 		this.setContentPane(getJContentPane());
 	}
 
@@ -92,6 +95,14 @@
 			passwordField = new JPasswordField();
 			int h = passwordField.getFont().getSize()+10;
 			passwordField.setPreferredSize(new Dimension(200, h));
+			passwordField.addKeyListener(new java.awt.event.KeyAdapter() {   
+				public void keyReleased(java.awt.event.KeyEvent e) {    
+					if (e.getKeyCode() == 10) //Return
+						getSave().doClick();
+					else if (e.getKeyCode() == 27) //esc
+						getCancel().doClick();
+				}
+			});
 		}
 		return passwordField;
 	}
diff -r 5f24ee46836c925571045892bd9958b2310c8bd6 -r 4581103ec2ba103796c10c7decff5c92e9062207 src/org/abisso/PortableNotary/GUI/PreferencesDialog.java
--- a/src/org/abisso/PortableNotary/GUI/PreferencesDialog.java	Fri Jun 15 09:37:18 2007 +0200
+++ b/src/org/abisso/PortableNotary/GUI/PreferencesDialog.java	Fri Jun 15 16:22:15 2007 +0200
@@ -22,10 +22,13 @@
 
 import javax.swing.JButton;
 import javax.swing.JDialog;
+import javax.swing.JFileChooser;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JPasswordField;
 import javax.swing.JTextField;
+import java.awt.Font;
+import java.io.File;
 
 public class PreferencesDialog extends JDialog {
 
@@ -59,7 +62,7 @@
 	 * @return void
 	 */
 	private void initialize() {
-		this.setSize(400, 200);
+		this.setSize(479, 168);
 		this.setContentPane(getJContentPane());
 		this.setTitle("Preferences");
 	}
@@ -101,9 +104,12 @@
 			GridBagConstraints gridBagConstraints = new GridBagConstraints();
 			gridBagConstraints.gridx = 0;
 			gridBagConstraints.gridwidth = 3;
+			gridBagConstraints.fill = GridBagConstraints.NONE;
 			gridBagConstraints.gridy = 0;
 			warning = new JLabel();
-			warning.setText("WARNING: Password are stored in unsafe way");
+			warning.setText("<html><b>" + "WARNING:" + 
+					"</b> " + "Password are stored in unsafe way" + "</html>");
+			warning.setFont(new Font("Dialog", Font.PLAIN, 14));
 			jContentPane = new JPanel();
 			jContentPane.setLayout(new GridBagLayout());
 			jContentPane.add(warning, gridBagConstraints);
@@ -162,8 +168,18 @@
 	private JButton getBrowse() {
 		if (browse == null) {
 			browse = new JButton("Browse");
-			//TODO: implement keystore browsing
-			browse.setEnabled(false);
+			browse.addActionListener(new java.awt.event.ActionListener() {
+				public void actionPerformed(java.awt.event.ActionEvent e) {
+					JFileChooser fc = new JFileChooser();
+					fc.setDialogType(JFileChooser.OPEN_DIALOG);
+					int returnVal = fc.showOpenDialog(PreferencesDialog.this);
+
+			        if (returnVal == JFileChooser.APPROVE_OPTION) {
+			            File file = fc.getSelectedFile();
+			            getTextPath().setText(file.getAbsolutePath());
+			        }
+				}
+			});
 		}
 		return browse;
 	}
@@ -203,4 +219,4 @@
 		}
 		return cancel;
 	}
-}
+}  //  @jve:decl-index=0:visual-constraint="10,10"
diff -r 5f24ee46836c925571045892bd9958b2310c8bd6 -r 4581103ec2ba103796c10c7decff5c92e9062207 src/org/abisso/PortableNotary/PortableNotary.java
--- a/src/org/abisso/PortableNotary/PortableNotary.java	Fri Jun 15 09:37:18 2007 +0200
+++ b/src/org/abisso/PortableNotary/PortableNotary.java	Fri Jun 15 16:22:15 2007 +0200
@@ -16,6 +16,9 @@
 package org.abisso.PortableNotary;
 
 
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+
 import org.abisso.PortableNotary.GUI.MainFrame;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
@@ -120,6 +123,24 @@
 		    }
 		    
 		    if (!line.hasOption("t")) {
+		    	try {
+		            // Set System L&F
+		            UIManager.setLookAndFeel(
+		                UIManager.getSystemLookAndFeelClassName());
+		        } 
+		        catch (UnsupportedLookAndFeelException e) {
+		           // handle exception
+		        }
+		        catch (ClassNotFoundException e) {
+		           // handle exception
+		        }
+		        catch (InstantiationException e) {
+		           // handle exception
+		        }
+		        catch (IllegalAccessException e) {
+		           // handle exception
+		        }
+		    	
 		    	MainFrame win = new MainFrame();
 		    	win.setDefaultCloseOperation(javax.swing.JFrame.EXIT_ON_CLOSE);
 		    	win.setDefaultLookAndFeelDecorated(true);
@@ -164,4 +185,5 @@
 		usage.printHelp("PortableNotary [opts] filename",options); //$NON-NLS-1$
 	}
 
+
 }