[Cdk-commits] CVS: cdk/src/org/openscience/cdk/applications/jchempaint JChemPaintEditorPanel.java,1.7,1.8 JChemPaintPanel.java,1.6,1.7

[Christoph S. <ste...@us...>]

Update of /cvsroot/cdk/cdk/src/org/openscience/cdk/applications/jchempaint
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23996/org/openscience/cdk/applications/jchempaint

Modified Files:
	JChemPaintEditorPanel.java JChemPaintPanel.java 
Log Message:
Inserted a pack() statement and moved some methods


Index: JChemPaintEditorPanel.java
===================================================================
RCS file: /cvsroot/cdk/cdk/src/org/openscience/cdk/applications/jchempaint/JChemPaintEditorPanel.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- JChemPaintEditorPanel.java	26 Apr 2005 11:07:23 -0000	1.7
+++ JChemPaintEditorPanel.java	26 Apr 2005 12:10:06 -0000	1.8
@@ -214,7 +214,41 @@
 		return jcpm.getRendererModel().getBackgroundDimension();
 	}
 
+		/**
+	 *  Creates a new JFrame that owns a new JChemPaintModel and returns
+	 *  it. 
+	 *
+	 *@return    The new JFrame containing the JChemPaintEditorPanel
+	 */
+	public static JFrame getEmptyFrameWithModel()
+	{
+		JChemPaintModel jcpm = new JChemPaintModel();
+		jcpm.setTitle(getNewFrameName());
+		jcpm.setAuthor(JCPPropertyHandler.getInstance().getJCPProperties().getProperty("General.UserName"));
+		Package self = Package.getPackage("org.openscience.cdk.applications.jchempaint");
+		String version = self.getImplementationVersion();
+		jcpm.setSoftware("JChemPaint " + version);
+		jcpm.setGendate((Calendar.getInstance()).getTime().toString());
+		JFrame jcpf = getNewFrame(jcpm);
+		return jcpf;
+	}
+
+	
+	/**
+	 *  Creates a new JChemPaintEditorPanel and assigns a given Model to it.
+	 *
+	 *@param  jcpm  The model to be assigned to the new frame.
+	 *@return       The new JChemPaintFrame with its new JChemPaintModel
+	 */
+	public static JFrame getNewFrame(JChemPaintModel jcpm)
+	{
+		JFrame frame = new JFrame();
+		frame.getContentPane().add(new JChemPaintEditorPanel(jcpm));
+		frame.setTitle(jcpm.getTitle());
+		return frame;
+	}
 
+	
 	/**
 	 *  Sets the jChemPaintModel attribute of the JChemPaintPanel object
 	 *

Index: JChemPaintPanel.java
===================================================================
RCS file: /cvsroot/cdk/cdk/src/org/openscience/cdk/applications/jchempaint/JChemPaintPanel.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JChemPaintPanel.java	26 Apr 2005 11:28:37 -0000	1.6
+++ JChemPaintPanel.java	26 Apr 2005 12:10:06 -0000	1.7
@@ -102,6 +102,16 @@
 	{
 	}
 
+	/**
+	 *  Creates a new localized string that can be used as a title for the new
+	 *  frame.
+	 *
+	 *@return    The newFrameName value
+	 */
+	public static String getNewFrameName()
+	{
+		return JCPLocalizationHandler.getInstance().getString("Untitled-") + Integer.toString(1);
+	}
 
 	/**
 	 *  Description of the Method