Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18190/src/net/sourceforge/bprocessor/gui/actions
Modified Files:
CreateConstructionSpaceActionListener.java
CreateFunctionalSpaceActionListener.java
Log Message:
Fixes
Index: CreateFunctionalSpaceActionListener.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/CreateFunctionalSpaceActionListener.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** CreateFunctionalSpaceActionListener.java 4 Oct 2006 14:43:24 -0000 1.11
--- CreateFunctionalSpaceActionListener.java 31 Jan 2007 15:22:19 -0000 1.12
***************
*** 7,11 ****
package net.sourceforge.bprocessor.gui.actions;
! import net.sourceforge.bprocessor.gui.GUI;
import net.sourceforge.bprocessor.model.Project;
import net.sourceforge.bprocessor.model.Space;
--- 7,11 ----
package net.sourceforge.bprocessor.gui.actions;
! import net.sourceforge.bprocessor.gui.attrview.AttributeView;
import net.sourceforge.bprocessor.model.Project;
import net.sourceforge.bprocessor.model.Space;
***************
*** 13,17 ****
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
- import javax.swing.JOptionPane;
import org.apache.log4j.Logger;
--- 13,16 ----
***************
*** 35,55 ****
*/
public void actionPerformed(ActionEvent e) {
! String result = JOptionPane.showInputDialog(GUI.getInstance(),
! "Name",
! "Create Functional Space",
! JOptionPane.QUESTION_MESSAGE);
! if (log.isDebugEnabled()) {
! log.debug("Input: " + result);
! }
!
! if (result != null && !result.trim().equals("")) {
! try {
! Space fs = Project.getInstance().getActiveSpace().createFunctionalSpace(result.trim());
! Project.getInstance().getActiveSpace().add(fs);
! Project.getInstance().changed(Project.getInstance().getActiveSpace());
! Project.getInstance().checkpoint();
! } catch (Exception ex) {
! ex.printStackTrace();
! }
}
}
--- 34,46 ----
*/
public void actionPerformed(ActionEvent e) {
! try {
! Space owner = Project.getInstance().world();
! Space space;
! space = owner.createFunctionalSpace("Functional");
! owner.add(space);
! AttributeView.instance().display(space);
! Project.getInstance().checkpoint();
! } catch (Exception error) {
! error.printStackTrace();
}
}
Index: CreateConstructionSpaceActionListener.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/CreateConstructionSpaceActionListener.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** CreateConstructionSpaceActionListener.java 16 Nov 2006 23:20:04 -0000 1.12
--- CreateConstructionSpaceActionListener.java 31 Jan 2007 15:22:19 -0000 1.13
***************
*** 7,11 ****
package net.sourceforge.bprocessor.gui.actions;
! import net.sourceforge.bprocessor.gui.GUI;
import net.sourceforge.bprocessor.model.Project;
import net.sourceforge.bprocessor.model.Space;
--- 7,11 ----
package net.sourceforge.bprocessor.gui.actions;
! import net.sourceforge.bprocessor.gui.attrview.AttributeView;
import net.sourceforge.bprocessor.model.Project;
import net.sourceforge.bprocessor.model.Space;
***************
*** 14,19 ****
import java.awt.event.ActionListener;
- import javax.swing.JOptionPane;
-
import org.apache.log4j.Logger;
--- 14,17 ----
***************
*** 37,64 ****
*/
public void actionPerformed(ActionEvent e) {
! String result = JOptionPane.showInputDialog(GUI.getInstance(),
! "Name",
! "Create Construction Space",
! JOptionPane.QUESTION_MESSAGE);
!
!
!
! if (log.isDebugEnabled()) {
! log.debug("Input: " + result);
! }
!
! if (result != null && !result.trim().equals("")) {
! try {
! Space cs = Project.getInstance().getActiveSpace().createConstructionSpace(result.trim());
! Project.getInstance().getActiveSpace().add(cs);
! Project.getInstance().changed(Project.getInstance().getActiveSpace());
! Project.getInstance().checkpoint();
! } catch (Exception ex) {
! ex.printStackTrace();
! }
}
-
-
}
-
}
--- 35,48 ----
*/
public void actionPerformed(ActionEvent e) {
! try {
! Space owner = Project.getInstance().world();
! Space space;
! space = owner.createConstructionSpace("Construction");
! owner.add(space);
! AttributeView.instance().display(space);
! Project.getInstance().checkpoint();
! } catch (Exception error) {
! error.printStackTrace();
}
}
}
|
