Author: chatellier Date: 2009-04-16 13:02:03 +0000 (Thu, 16 Apr 2009) New Revision: 2110 Modified: isis-fish/trunk/pom.xml isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/QueueUI.jaxx Log: Remove beanbindings (only use jaxx bindings) But not work Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-04-15 15:10:16 UTC (rev 2109) +++ isis-fish/trunk/pom.xml 2009-04-16 13:02:03 UTC (rev 2110) @@ -122,13 +122,6 @@ </dependency> <dependency> - <groupId>org.jdesktop</groupId> - <artifactId>beansbinding</artifactId> - <version>1.2.1</version> - <scope>compile</scope> - </dependency> - - <dependency> <groupId>dom4j</groupId> <artifactId>dom4j</artifactId> <version>1.6.1</version> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/QueueUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/QueueUI.jaxx 2009-04-15 15:10:16 UTC (rev 2109) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/QueueUI.jaxx 2009-04-16 13:02:03 UTC (rev 2110) @@ -38,46 +38,20 @@ import javax.swing.JProgressBar; import javax.swing.ListSelectionModel; import javax.swing.table.TableCellRenderer; - import org.jdesktop.beansbinding.AutoBinding; - import org.jdesktop.beansbinding.BeanProperty; - import org.jdesktop.beansbinding.Binding; - import org.jdesktop.beansbinding.BindingGroup; - import org.jdesktop.beansbinding.Bindings; - import org.jdesktop.beansbinding.ELProperty; - initBindings(); + // TODO this code is magic + // lucky executed BEFORE ui + initContext(); - public void initBindings() { + public void initContext() { SimulationService ss = SimulationService.getService(); - - BindingGroup bindingGroup = new BindingGroup(); - setContextValue(new SimulationServiceTableModel(ss, true), "new"); setContextValue(new SimulationServiceTableModel(ss, false), "done"); - queueTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - queueTableDone.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); queueTable.setDefaultRenderer(JProgressBar.class, new JProgressBarTableCellRenderer()); queueTableDone.setDefaultRenderer(JProgressBar.class, new JProgressBarTableCellRenderer()); - - Binding binding = Bindings.createAutoBinding(AutoBinding.UpdateStrategy.READ_WRITE, SimulationService.getService(), ELProperty.create("${autoLaunch}"),autoLaunchButton, BeanProperty.create("selected")); - bindingGroup.addBinding(binding); - - // binding for stop simulation button - binding = Bindings.createAutoBinding(AutoBinding.UpdateStrategy.READ,queueTable, ELProperty.create("${selectedElement != null}"),stopSimuButton, BeanProperty.create("enabled")); - binding.setSourceNullValue(false); - binding.setSourceUnreadableValue(false); - bindingGroup.addBinding(binding); - - // binding for view log button - binding = Bindings.createAutoBinding(AutoBinding.UpdateStrategy.READ, queueTableDone, ELProperty.create("${selectedElement != null}"), showLogButton, BeanProperty.create("enabled")); - binding.setSourceNullValue(false); - binding.setSourceUnreadableValue(false); - bindingGroup.addBinding(binding); - - bindingGroup.bind(); } - public QueueUI (SimulAction action) { + public QueueUI(SimulAction action) { setContextValue(action); } @@ -120,7 +94,7 @@ <row> <cell columns="4" fill="both" weightx="1.0" weighty="0.5"> <JScrollPane> - <JTable id="queueTableDone" model='{getContextValue(SimulationServiceTableModel.class, "done")}'/> + <JTable id="queueTableDone" model='{getContextValue(SimulationServiceTableModel.class, "done")}' selectionMode="{ListSelectionModel.SINGLE_SELECTION}" /> </JScrollPane> </cell> </row> @@ -129,13 +103,13 @@ <JToggleButton id="autoLaunchButton" text="isisfish.queue.simulationLaunch"/> </cell> <cell fill="horizontal" weightx="0.3"> - <JButton id="stopSimuButton" text="isisfish.queue.stopSimulation" onActionPerformed='stopSimulation()'/> + <JButton id="stopSimuButton" text="isisfish.queue.stopSimulation" onActionPerformed='stopSimulation()' enabled='{queueTable.getSelectionModel().getMinSelectionIndex() != -1}' /> </cell> <cell fill="horizontal" weightx="0.3"> - <JButton id="showLogButton" text="isisfish.queue.showLog" onActionPerformed='viewLog()'/> + <JButton id="showLogButton" text="isisfish.queue.showLog" onActionPerformed='viewLog()' enabled='{!queueTableDone.getSelectionModel().isSelectionEmpty()}' /> </cell> <cell fill="horizontal" weightx="0.3"> - <JButton id="clearDoneJobsButton" text="isisfish.queue.clearDone" onActionPerformed='clearDoneJobs()'/> + <JButton id="clearDoneJobsButton" text="isisfish.queue.clearDone" onActionPerformed='clearDoneJobs()' enabled='{queueTableDone.getModel().getRowCount() > 0}' /> </cell> </row> </Table> \ No newline at end of file