Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18875/src/net/sourceforge/bprocessor/gl
Modified Files:
Editor.java
Log Message:
multi/single choice selecting in space-assignment tool
Index: Editor.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/Editor.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Editor.java 20 Nov 2007 14:56:46 -0000 1.5
--- Editor.java 21 Nov 2007 09:21:17 -0000 1.6
***************
*** 28,31 ****
--- 28,33 ----
import java.awt.event.MouseListener;
import java.awt.event.ActionListener;
+ import java.net.URL;
+ import java.util.List;
import javax.media.opengl.GLCanvas;
***************
*** 35,38 ****
--- 37,41 ----
import javax.swing.Box;
+ import javax.swing.ImageIcon;
import javax.swing.JColorChooser;
import javax.swing.JComboBox;
***************
*** 45,48 ****
--- 48,52 ----
import javax.swing.JMenuItem;
import javax.swing.JPopupMenu;
+ import javax.swing.JToggleButton;
import javax.swing.SwingConstants;
import javax.swing.SwingUtilities;
***************
*** 57,60 ****
--- 61,69 ----
/** The logger */
private static Logger log = Logger.getLogger(Editor.class);
+
+ /**
+ *
+ */
+ private static boolean multi;
/** GL canvas */
***************
*** 69,73 ****
/** the length parameter */
private LengthField lengthField;
!
/** The label and combobox for the reality factor */
private FactorBox factor;
--- 78,85 ----
/** the length parameter */
private LengthField lengthField;
!
! private Box controlarea;
! private JComponent controlpanel;
!
/** The label and combobox for the reality factor */
private FactorBox factor;
***************
*** 79,82 ****
--- 91,123 ----
private JPanel jp;
+
+ /**
+ * Change value of multi
+ * @param value new value
+ */
+ public static void setMulti(boolean value) {
+ multi = value;
+ }
+
+ /**
+ * Returns the value of multi
+ * @return value of multi
+ */
+ public static boolean isMulti() {
+ return multi;
+ }
+
+ private void setControlPanel(JComponent panel) {
+ if (controlpanel != null) {
+ controlarea.remove(controlpanel);
+ controlpanel = null;
+ }
+ if (panel != null) {
+ controlarea.add(panel);
+ controlpanel = panel;
+ }
+ StatusBar.instance().content().revalidate();
+ }
+
private JComponent createSeparator(int height) {
JSeparator separator = new JSeparator(SwingConstants.VERTICAL);
***************
*** 96,99 ****
--- 137,158 ----
}
+
+ private JComponent createControlPanel(List<JComponent> controls) {
+ Box panel = Box.createHorizontalBox();
+ for (JComponent current : controls) {
+ panel.add(current);
+ panel.add(Box.createHorizontalStrut(5));
+ }
+ return panel;
+ }
+
+ private JComponent createButton(String name) {
+ ClassLoader cl = Thread.currentThread().getContextClassLoader();
+ URL url = cl.getResource(name);
+ ImageIcon im = new ImageIcon(url);
+ JToggleButton button = new JToggleButton(im);
+ return button;
+ }
+
private JComponent createLengthPanel() {
Box lengthpanel = Box.createVerticalBox();
***************
*** 101,104 ****
--- 160,166 ----
Box lengtharea = Box.createHorizontalBox();
lengtharea.add(Box.createHorizontalGlue());
+ controlarea = Box.createHorizontalBox();
+
+ lengtharea.add(controlarea);
lengtharea.add(new JLabel("Length:"));
lengtharea.add(Box.createHorizontalStrut(3));
***************
*** 179,182 ****
--- 241,248 ----
tool = ToolFactory.getFactory(this).getDefault();
setTip(tool.initialTip());
+ tool.prepare();
+ List<JComponent> controls = tool.controls();
+ JComponent panel = createControlPanel(controls);
+ setControlPanel(panel);
view = new View(this);
***************
*** 322,325 ****
--- 388,394 ----
setTip(tool.initialTip());
tool.prepare();
+ List<JComponent> controls = tool.controls();
+ JComponent panel = createControlPanel(controls);
+ setControlPanel(panel);
} else {
log.error("[changeMode] tool was null");
|
