[Jchempaint-commit] CVS: JCPCDK/src/org/openscience/jchempaint/application JChemPaint.java,1.9,1.10 JChemPaintFrame.java,1.9,1.10

[Egon W. <eg...@us...>]

Update of /cvsroot/jchempaint/JCPCDK/src/org/openscience/jchempaint/application
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14275/src/org/openscience/jchempaint/application

Modified Files:
	JChemPaint.java JChemPaintFrame.java 
Log Message:
Fixed screen size problem, but no still no structures visible upon editing. Maybe viewing only?

Index: JChemPaint.java
===================================================================
RCS file: /cvsroot/jchempaint/JCPCDK/src/org/openscience/jchempaint/application/JChemPaint.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- JChemPaint.java	21 Mar 2005 15:37:27 -0000	1.9
+++ JChemPaint.java	14 Apr 2005 19:24:48 -0000	1.10
@@ -254,7 +254,7 @@
 		this.sdi = sdi;
 		this.embedded = embedded;
 		// configure Logger
-		logger = new LoggingTool(this.getClass().getName(), true);
+		logger = new LoggingTool(this);
 		logger.dumpSystemProperties();
 
         logger.debug(" ++++ ++++ ++++ ++++ ++++ ++++ ++++ ");

Index: JChemPaintFrame.java
===================================================================
RCS file: /cvsroot/jchempaint/JCPCDK/src/org/openscience/jchempaint/application/JChemPaintFrame.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- JChemPaintFrame.java	18 Jan 2005 08:53:31 -0000	1.9
+++ JChemPaintFrame.java	14 Apr 2005 19:24:48 -0000	1.10
@@ -1,11 +1,11 @@
-/*  $RCSfile$
- *  $Author$
- *  $Date$
- *  $Revision$
+/* $RCSfile$
+ * $Author$
+ * $Date$
+ * $Revision$
  *
- *  Copyright (C) 1997-2005  The JChemPaint project
+ * Copyright (C) 1997-2005  The JChemPaint project
  *
- *  Contact: jch...@li...
+ * Contact: jch...@li...
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
@@ -102,39 +102,39 @@
         
 		// create the panels and toolbars
 		workPanel = new JPanel();
-		gridbag = new GridBagLayout();
+        workPanel.setLayout(new BorderLayout());
+        workPanel.setBackground(Color.WHITE);
+		/* gridbag = new GridBagLayout();
 		gridBagConstraints = new GridBagConstraints();
-		workPanel.setLayout(gridbag);
+		workPanel.setLayout(gridbag); */
 
         boolean addPluginMenu = true;
 
-		gridBagConstraints.fill = GridBagConstraints.BOTH;
+		/* gridBagConstraints.fill = GridBagConstraints.BOTH;
 		gridBagConstraints.weightx = 0.0;
 		gridBagConstraints.gridy = 0;
-		gridBagConstraints.gridwidth = GridBagConstraints.REMAINDER;
+		gridBagConstraints.gridwidth = GridBagConstraints.REMAINDER; */
 
 		jcpp.setupPopupMenus();
-		JScrollPane scrollpane = new JScrollPane(jcpp);
 		modelChangeListeners = jcpm.getChangeListeners();
-        gridbag.setConstraints(scrollpane, gridBagConstraints);
-		workPanel.add(scrollpane);
+		workPanel.add(jcpp, BorderLayout.CENTER);
         
 		statusBar = new StatusBar();
-		gridBagConstraints.weightx = 0.0;
+		/* gridBagConstraints.weightx = 0.0;
 		gridBagConstraints.weighty = 0.0;
 		gridBagConstraints.gridy = 1;
 		gridBagConstraints.gridwidth = GridBagConstraints.REMAINDER;
-		gridbag.setConstraints(statusBar, gridBagConstraints);
-		workPanel.add(statusBar);
+		gridbag.setConstraints(statusBar, gridBagConstraints); */
+		workPanel.add(statusBar, BorderLayout.SOUTH);
         
 		// even if not shown, define them anyway
 		develStatusBar = new DevelStatusBar();
-        logger.info("Showing Developers GUI");
+        /* logger.info("Showing Developers GUI");
 
         gridBagConstraints.gridwidth = GridBagConstraints.REMAINDER;
 		gridBagConstraints.gridy = 2;
         gridbag.setConstraints(develStatusBar, gridBagConstraints);
-        workPanel.add(develStatusBar);
+        workPanel.add(develStatusBar); */
         getContentPane().add(workPanel, BorderLayout.CENTER);
 
         pack();