Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[7552] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2012-08-15 13:26:09
|
Revision: 7552
http://fudaa.svn.sourceforge.net/fudaa/?rev=7552&view=rev
Author: deniger
Date: 2012-08-15 13:26:01 +0000 (Wed, 15 Aug 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/pom.xml
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/editor/SpinnerInplaceEditor.java
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/DialogHelper.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingFilesTopComponent.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/ConfigurationUI.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/ConfigureUIAction.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/PlanimetryController.java
trunk/soft/fudaa-crue/ui-study/pom.xml
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/dialog/ManageManagerEMHContainerDialog.java
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/services/GlobalStateManager.java
trunk/soft/fudaa-crue/ui-study/src/main/resources/org/fudaa/fudaa/crue/study/layer.xml
trunk/soft/fudaa-crue/ui-study/src/main/resources/org/fudaa/fudaa/crue/study/services/Bundle.properties
Added Paths:
-----------
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/services/GlobalStateManagerRien.java
trunk/soft/fudaa-crue/ui-study/src/test/java/TestScrollPane.java
Modified: trunk/soft/fudaa-crue/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/pom.xml 2012-08-15 13:23:50 UTC (rev 7551)
+++ trunk/soft/fudaa-crue/pom.xml 2012-08-15 13:26:01 UTC (rev 7552)
@@ -94,7 +94,7 @@
<artifactId>swingx-all</artifactId>
<version>1.6.3</version>
</dependency>
-<!-- <dependency>
+ <!-- <dependency>
<groupId>net.java.dev.glazedlists</groupId>
<artifactId>glazedlists_java15</artifactId>
<version>1.8.0</version>
@@ -218,7 +218,7 @@
<type>nbm</type>
</dependency>
- <!-- Externes -->
+ <!-- Externes -->
<dependency>
<groupId>commons-jxpath</groupId>
<artifactId>commons-jxpath</artifactId>
@@ -234,6 +234,11 @@
<artifactId>xstream</artifactId>
<version>1.4.2</version>
</dependency>
+ <dependency>
+ <groupId>com.jidesoft</groupId>
+ <artifactId>jide-oss</artifactId>
+ <version>3.4.3</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<build>
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/editor/SpinnerInplaceEditor.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/editor/SpinnerInplaceEditor.java 2012-08-15 13:23:50 UTC (rev 7551)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/editor/SpinnerInplaceEditor.java 2012-08-15 13:26:01 UTC (rev 7552)
@@ -1,12 +1,24 @@
package org.fudaa.fudaa.crue.common.editor;
import java.awt.Component;
+import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
import java.beans.PropertyEditor;
+import java.beans.PropertyVetoException;
+import java.beans.VetoableChangeListener;
+import java.text.ParseException;
+import java.util.HashSet;
+import java.util.Set;
import javax.swing.JComponent;
import javax.swing.JSpinner;
import javax.swing.KeyStroke;
import javax.swing.SpinnerNumberModel;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
import org.openide.explorer.propertysheet.InplaceEditor;
import org.openide.explorer.propertysheet.PropertyEnv;
import org.openide.explorer.propertysheet.PropertyModel;
@@ -15,7 +27,7 @@
*
* @author deniger ( genesis)
*/
-public class SpinnerInplaceEditor implements InplaceEditor {
+public class SpinnerInplaceEditor implements InplaceEditor, FocusListener {
private final JSpinner spinner;
private PropertyEditor editor = null;
@@ -23,9 +35,24 @@
public SpinnerInplaceEditor(SpinnerNumberModel model) {
this.spinner = new JSpinner(model);
+ spinner.getEditor().addFocusListener(this);
+
}
+ void componentEdited() {
+ }
+
@Override
+ public void focusLost(FocusEvent e) {
+ fire(COMMAND_SUCCESS);
+ }
+
+ @Override
+ public void focusGained(FocusEvent e) {
+// System.err.println("Yes");
+ }
+
+ @Override
public void connect(PropertyEditor propertyEditor, PropertyEnv env) {
editor = propertyEditor;
reset();
@@ -45,6 +72,10 @@
@Override
public Object getValue() {
+ try {
+ spinner.commitEdit();
+ } catch (ParseException parseException) {
+ }
return spinner.getValue();
}
@@ -94,14 +125,23 @@
public boolean isKnownComponent(Component component) {
return component == spinner || spinner.isAncestorOf(component);
}
+ Set<ActionListener> actionListeners = new HashSet<ActionListener>();
@Override
public void addActionListener(ActionListener actionListener) {
- //do nothing - not needed for this component
+ actionListeners.add(actionListener);
}
+ private void fire(String command) {
+ ActionEvent evt = new ActionEvent(this, 0, command);
+ for (ActionListener actionListener : actionListeners) {
+ actionListener.actionPerformed(evt);
+
+ }
+ }
+
@Override
public void removeActionListener(ActionListener actionListener) {
- //do nothing - not needed for this component
+ actionListeners.remove(actionListener);
}
}
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/DialogHelper.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/DialogHelper.java 2012-08-15 13:23:50 UTC (rev 7551)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/DialogHelper.java 2012-08-15 13:26:01 UTC (rev 7552)
@@ -1,6 +1,11 @@
package org.fudaa.fudaa.crue.common.helper;
+import java.awt.Component;
import java.awt.EventQueue;
+import java.util.ArrayList;
+import java.util.List;
+import javax.swing.JComponent;
+import javax.swing.JScrollPane;
import org.fudaa.ctulu.gui.CtuluDialog;
import org.fudaa.ctulu.gui.CtuluDialogPanel;
import org.fudaa.fudaa.crue.common.CrueIconsProvider;
@@ -19,6 +24,33 @@
*/
public class DialogHelper {
+ public static < T extends JComponent> List<T> findComponent(JComponent parent, Class<T> type) {
+ List<T> res = new ArrayList<T>();
+ findComponent(parent, type, res);
+ return res;
+ }
+
+ public static < T extends JComponent> void findComponent(JComponent currentComponent, Class<T> type, List<T> target) {
+ if (currentComponent instanceof JScrollPane) {
+ findComponent((JComponent) ((JScrollPane) currentComponent).getViewport().getView(), type, target);
+ return;
+ }
+
+ if (type.isAssignableFrom(currentComponent.getClass())) {
+ target.add((T) currentComponent);
+ return;
+ }
+ Component[] components = currentComponent.getComponents();
+ if (components == null) {
+ return;
+ }
+ for (Component component : components) {
+ if (component instanceof JComponent) {
+ findComponent((JComponent) component, type, target);
+ }
+ }
+ }
+
public static void showDialogAndTable(final CtuluDialogPanel pn, final int dialogOption,
final JXTable table, final String dialogName, final String dialogTitle) {
@@ -29,7 +61,6 @@
s.setName(dialogName);
s.afficheDialogModal(new Runnable() {
-
@Override
public void run() {
UserPreferencesSaver.loadDialogLocationAndDimension(s);
@@ -84,7 +115,6 @@
public static void showInfo(final String title, final Object msg, boolean later) {
if (later) {
EventQueue.invokeLater(new Runnable() {
-
@Override
public void run() {
showInfo(title, msg);
@@ -202,7 +232,6 @@
protected static void loadTablePreferencesLater(final JXTable table) {
EventQueue.invokeLater(new Runnable() {
-
@Override
public void run() {
UserPreferencesSaver.loadTablePreferences(table);
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingFilesTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingFilesTopComponent.java 2012-08-15 13:23:50 UTC (rev 7551)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingFilesTopComponent.java 2012-08-15 13:26:01 UTC (rev 7552)
@@ -31,7 +31,7 @@
import org.openide.util.LookupListener;
/**
- * Top component which displays something.
+ * Contient l'arbres de calques. Devrait être renomé.
*/
@ConvertAsProperties(dtd = "-//org.fudaa.fudaa.crue.modelling//ModellingFilesTopComponent//EN",
autostore = false)
@@ -83,6 +83,9 @@
*/
@Override
protected void scenarioLoaded() {
+ if (scenarioVisuService.getPlanimetryVisuPanel() != null) {
+ scenarioVisuLoaded();
+ }
}
protected void scenarioVisuLoaded() {
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/ConfigurationUI.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/ConfigurationUI.java 2012-08-15 13:23:50 UTC (rev 7551)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/ConfigurationUI.java 2012-08-15 13:26:01 UTC (rev 7552)
@@ -115,6 +115,11 @@
}
OutlineView listView;
PropertySheetView sheetView;
+
+
+ public void validEdition(){
+
+ }
public void initComponents() {
setLayout(new BorderLayout(5, 5));
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/ConfigureUIAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/ConfigureUIAction.java 2012-08-15 13:23:50 UTC (rev 7551)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/ConfigureUIAction.java 2012-08-15 13:26:01 UTC (rev 7552)
@@ -2,14 +2,13 @@
import com.memoire.bu.BuResource;
import com.rits.cloning.Cloner;
-import com.sun.pdfview.font.ttf.HeadTable;
import java.awt.Dialog;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.List;
-import javax.swing.JDialog;
-import org.fudaa.ebli.calque.BCalque;
+import javax.swing.JTable;
import org.fudaa.ebli.commun.EbliActionSimple;
+import org.fudaa.fudaa.crue.common.helper.DialogHelper;
import org.fudaa.fudaa.crue.planimetry.configuration.VisuConfiguration;
import org.fudaa.fudaa.crue.planimetry.configuration.node.AdditionalConfigurationNode;
import org.fudaa.fudaa.crue.planimetry.layer.PlanimetryAdditionalLayerContrat;
@@ -30,7 +29,7 @@
public ConfigureUIAction(PlanimetryVisuPanel panel) {
super(NbBundle.getMessage(ConfigureUIAction.class, "Configure.Action"), BuResource.BU.getToolIcon("configurer"),
- CONFIGURE_ACTION_KEY);
+ CONFIGURE_ACTION_KEY);
this.panel = panel;
}
@@ -46,15 +45,21 @@
final String apply = NbBundle.getMessage(ConfigureUIAction.class, "ConfigurationUI.Apply.Name");
Object[] options = new Object[]{NotifyDescriptor.OK_OPTION, apply, NotifyDescriptor.CANCEL_OPTION};
final DialogDescriptor dialogDescriptor = new DialogDescriptor(ui, (String) getValue(NAME), true, options,
- NotifyDescriptor.OK_OPTION,
- DialogDescriptor.DEFAULT_ALIGN,
- HelpCtx.DEFAULT_HELP,
- null);
+ NotifyDescriptor.OK_OPTION,
+ DialogDescriptor.DEFAULT_ALIGN,
+ HelpCtx.DEFAULT_HELP,
+ null);
dialogDescriptor.setClosingOptions(new Object[]{NotifyDescriptor.OK_OPTION, NotifyDescriptor.CANCEL_OPTION});
dialogDescriptor.setButtonListener(new ActionListener() {
-
@Override
public void actionPerformed(ActionEvent e) {
+ List<JTable> tables = DialogHelper.findComponent(ui.sheetView, JTable.class);
+ if (!tables.isEmpty()) {
+ JTable table = tables.get(0);
+ if (table.isEditing()) {
+ table.getCellEditor().stopCellEditing();
+ }
+ }
Object value = dialogDescriptor.getValue();
final boolean isApply = apply.equals(value);
if (NotifyDescriptor.OK_OPTION.equals(value) || isApply) {
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/PlanimetryController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/PlanimetryController.java 2012-08-15 13:23:50 UTC (rev 7551)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/PlanimetryController.java 2012-08-15 13:26:01 UTC (rev 7552)
@@ -173,7 +173,8 @@
saveConfiguration = cloner.deepClone(visuConfiguration);
}
apply(cloned);
- visuPanel.getVueCalque().repaint();
+ visuPanel.getVueCalque().repaint(0);
+ visuPanel.repaint();
getState().setStudyConfigModified();
}
Modified: trunk/soft/fudaa-crue/ui-study/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-study/pom.xml 2012-08-15 13:23:50 UTC (rev 7551)
+++ trunk/soft/fudaa-crue/ui-study/pom.xml 2012-08-15 13:26:01 UTC (rev 7552)
@@ -16,6 +16,10 @@
<dependencies>
<dependency>
+ <groupId>com.jidesoft</groupId>
+ <artifactId>jide-oss</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>crue-server</artifactId>
<scope>provided</scope>
@@ -146,14 +150,14 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
- <!-- to have the jar plugin pickup the nbm generated manifest -->
+ <!-- to have the jar plugin pickup the nbm generated manifest -->
<useDefaultManifestFile>true</useDefaultManifestFile>
</configuration>
</plugin>
</plugins>
<pluginManagement>
<plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
Modified: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/dialog/ManageManagerEMHContainerDialog.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/dialog/ManageManagerEMHContainerDialog.java 2012-08-15 13:23:50 UTC (rev 7551)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/dialog/ManageManagerEMHContainerDialog.java 2012-08-15 13:26:01 UTC (rev 7552)
@@ -89,7 +89,7 @@
if (creation) {
this.title = NbBundle.getMessage(FileDialog.class, "ManageManagerEMHContainerDialog.TitleCreation", this.convertLevel(level),
- this.convertVersion(version));
+ this.convertVersion(version));
} else {
this.title = NbBundle.getMessage(FileDialog.class, "ManageManagerEMHContainerDialog.TitleModification", this.convertLevel(
level), this.convertVersion(version));
@@ -161,7 +161,6 @@
modelesList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
sousModelesList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
modelesList.addListSelectionListener(new ListSelectionListener() {
-
@Override
public void valueChanged(ListSelectionEvent e) {
jButtonModeleEdit.setEnabled(!modelesList.isSelectionEmpty());
@@ -169,14 +168,12 @@
});
sousModelesList.addListSelectionListener(new ListSelectionListener() {
-
@Override
public void valueChanged(ListSelectionEvent e) {
jButtonSousModeleEdit.setEnabled(!sousModelesList.isSelectionEmpty());
}
});
modelesList.addMouseListener(new MouseAdapter() {
-
@Override
public void mouseClicked(MouseEvent e) {
if (e.getClickCount() == 2) {
@@ -185,7 +182,6 @@
}
});
sousModelesList.addMouseListener(new MouseAdapter() {
-
@Override
public void mouseClicked(MouseEvent e) {
if (e.getClickCount() == 2) {
@@ -204,8 +200,8 @@
JComboBox combox = createModelCombo(currentValue.nom);
combox.setSelectedItem(currentValue.nom);
if (JOptionPane.showConfirmDialog(this, combox, NbBundle.getMessage(ManageManagerEMHContainerDialog.class,
- "ManageManagerEMHContainerDialog.editModele"),
- JOptionPane.OK_CANCEL_OPTION) == JOptionPane.OK_OPTION) {
+ "ManageManagerEMHContainerDialog.editModele"),
+ JOptionPane.OK_CANCEL_OPTION) == JOptionPane.OK_OPTION) {
String newName = (String) combox.getSelectedItem();
//modification done:
if (newName != null && !newName.equals(currentValue.nom)) {
@@ -228,8 +224,8 @@
JComboBox combox = createSousModelCombo(currentValue.nom);
combox.setSelectedItem(currentValue.nom);
if (JOptionPane.showConfirmDialog(this, combox, NbBundle.getMessage(ManageManagerEMHContainerDialog.class,
- "ManageManagerEMHContainerDialog.editSousModele"),
- JOptionPane.OK_CANCEL_OPTION) == JOptionPane.OK_OPTION) {
+ "ManageManagerEMHContainerDialog.editSousModele"),
+ JOptionPane.OK_CANCEL_OPTION) == JOptionPane.OK_OPTION) {
String newName = (String) combox.getSelectedItem();
//modification done:
if (newName != null && !newName.equals(currentValue.nom)) {
@@ -373,8 +369,8 @@
}
/**
- * This method is called from within the constructor to initialize the form. WARNING: Do NOT modify this code. The content of
- * this method is always regenerated by the Form Editor.
+ * This method is called from within the constructor to initialize the form. WARNING: Do NOT modify this code. The content of this method is always
+ * regenerated by the Form Editor.
*/
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
private void initComponents() {
@@ -665,7 +661,7 @@
String msg = ValidationPatternHelper.isRadicalValideForEMHContainerMsg(radical);
if (msg != null) {
DialogHelper.showError(title, NbBundle.getMessage(ManageManagerEMHContainerDialog.class,
- "ManageManagerEMHContainerDialog.invalidName", BusinessMessages.getString(
+ "ManageManagerEMHContainerDialog.invalidName", BusinessMessages.getString(
msg)));
return;
}
@@ -678,8 +674,8 @@
final boolean isModificationAndOtherManagerWithSameName = !creation && existingContainer != null && existingContainer != container;
if (isCreationAndManagerExist || isModificationAndOtherManagerWithSameName) {
JOptionPane.showMessageDialog(this, NbBundle.getMessage(ManageManagerEMHContainerDialog.class,
- "ManageManagerEMHContainerDialog.nameExists", radical), title,
- JOptionPane.ERROR_MESSAGE);
+ "ManageManagerEMHContainerDialog.nameExists", radical), title,
+ JOptionPane.ERROR_MESSAGE);
return;
}
@@ -692,8 +688,8 @@
files.add(file);
} else {
JOptionPane.showMessageDialog(this, NbBundle.getMessage(ManageManagerEMHContainerDialog.class,
- "ManageManagerEMHContainerDialog.fileMissing"), title,
- JOptionPane.ERROR_MESSAGE);
+ "ManageManagerEMHContainerDialog.fileMissing"), title,
+ JOptionPane.ERROR_MESSAGE);
return;
}
@@ -706,8 +702,8 @@
boolean hasActive = scenarioContainsActiveModele();
if (!hasActive) {
JOptionPane.showMessageDialog(this, NbBundle.getMessage(ManageManagerEMHContainerDialog.class,
- "ManageManagerEMHContainerDialog.activeModele"), title,
- JOptionPane.ERROR_MESSAGE);
+ "ManageManagerEMHContainerDialog.activeModele"), title,
+ JOptionPane.ERROR_MESSAGE);
return;
}
}
@@ -715,15 +711,18 @@
boolean hasActive = modeleContainsActiveSousModele();
if (!hasActive) {
JOptionPane.showMessageDialog(this, NbBundle.getMessage(ManageManagerEMHContainerDialog.class,
- "ManageManagerEMHContainerDialog.activeSousModele"), title,
- JOptionPane.ERROR_MESSAGE);
+ "ManageManagerEMHContainerDialog.activeSousModele"), title,
+ JOptionPane.ERROR_MESSAGE);
return;
}
}
//ok maintenant on essaie de renommer le manager:
RenameManager renameMager = new RenameManager();
renameMager.setProject(projet);
- if (!renameMager.renameManager(CrueLevelType.getCatEMH(level), container, radical)) {
+ if (creation) {
+ //on ajoute le manager:
+ projet.addManager(CrueLevelType.getCatEMH(level), container, radical);
+ } else if (!renameMager.renameManager(CrueLevelType.getCatEMH(level), container, radical)) {
DialogHelper.showError(NbBundle.getMessage(ManageManagerEMHContainerDialog.class, "ModifiyEMHContainer.NameUsed", radical));
return;
}
@@ -763,14 +762,14 @@
}
if (JOptionPane.showConfirmDialog(this, modelesCombo, NbBundle.getMessage(ManageManagerEMHContainerDialog.class,
- "ManageManagerEMHContainerDialog.addModele"),
- JOptionPane.OK_CANCEL_OPTION) == JOptionPane.OK_OPTION) {
+ "ManageManagerEMHContainerDialog.addModele"),
+ JOptionPane.OK_CANCEL_OPTION) == JOptionPane.OK_OPTION) {
final int selectedIndex = modelesCombo.getSelectedIndex();
if (selectedIndex > -1) {
final SimplifiedManagerItem item = new SimplifiedManagerItem();
- item.nom =(String) modelesCombo.getSelectedItem();
+ item.nom = (String) modelesCombo.getSelectedItem();
((DefaultListModel) this.modelesList.getModel()).addElement(item);
@@ -784,8 +783,8 @@
final int selectedIndex = this.modelesList.getSelectedIndex();
if (selectedIndex != -1) {
if (JOptionPane.showConfirmDialog(this, NbBundle.getMessage(ManageManagerEMHContainerDialog.class,
- "ManageManagerEMHContainerDialog.removeModele"), title,
- JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION) {
+ "ManageManagerEMHContainerDialog.removeModele"), title,
+ JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION) {
((DefaultListModel) this.modelesList.getModel()).remove(selectedIndex);
this.modelesAddButton.setEnabled(true);
@@ -793,8 +792,8 @@
}
} else {
JOptionPane.showMessageDialog(this, NbBundle.getMessage(ManageManagerEMHContainerDialog.class,
- "ManageManagerEMHContainerDialog.selectModele"), title,
- JOptionPane.ERROR_MESSAGE);
+ "ManageManagerEMHContainerDialog.selectModele"), title,
+ JOptionPane.ERROR_MESSAGE);
}
}//GEN-LAST:event_modelesRemoveButtonActionPerformed
@@ -805,13 +804,13 @@
}
if (JOptionPane.showConfirmDialog(this, sousModelesCombo, NbBundle.getMessage(ManageManagerEMHContainerDialog.class,
- "ManageManagerEMHContainerDialog.addSousModele"),
- JOptionPane.OK_CANCEL_OPTION) == JOptionPane.OK_OPTION) {
+ "ManageManagerEMHContainerDialog.addSousModele"),
+ JOptionPane.OK_CANCEL_OPTION) == JOptionPane.OK_OPTION) {
final int selectedIndex = sousModelesCombo.getSelectedIndex();
if (selectedIndex > -1) {
final SimplifiedManagerItem item = new SimplifiedManagerItem();
- item.nom = (String)sousModelesCombo.getSelectedItem();
+ item.nom = (String) sousModelesCombo.getSelectedItem();
((DefaultListModel) this.sousModelesList.getModel()).addElement(item);
}
@@ -822,14 +821,14 @@
final int selectedIndex = this.sousModelesList.getSelectedIndex();
if (selectedIndex != -1) {
if (JOptionPane.showConfirmDialog(this, NbBundle.getMessage(ManageManagerEMHContainerDialog.class,
- "ManageManagerEMHContainerDialog.removeSousModele"), title,
- JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION) {
+ "ManageManagerEMHContainerDialog.removeSousModele"), title,
+ JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION) {
((DefaultListModel) this.sousModelesList.getModel()).remove(selectedIndex);
}
} else {
JOptionPane.showMessageDialog(this, NbBundle.getMessage(ManageManagerEMHContainerDialog.class,
- "ManageManagerEMHContainerDialog.selectSousModele"), title,
- JOptionPane.ERROR_MESSAGE);
+ "ManageManagerEMHContainerDialog.selectSousModele"), title,
+ JOptionPane.ERROR_MESSAGE);
}
}//GEN-LAST:event_sousModelesRemoveButtonActionPerformed
Modified: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/services/GlobalStateManager.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/services/GlobalStateManager.java 2012-08-15 13:23:50 UTC (rev 7551)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/services/GlobalStateManager.java 2012-08-15 13:26:01 UTC (rev 7552)
@@ -4,6 +4,8 @@
*/
package org.fudaa.fudaa.crue.study.services;
+import com.jidesoft.swing.SimpleScrollPane;
+import java.awt.BorderLayout;
import java.awt.Component;
import java.awt.FlowLayout;
import java.awt.event.ActionEvent;
@@ -32,10 +34,10 @@
import org.openide.util.lookup.Lookups;
@ActionID(category = "File",
- id = "org.fudaa.fudaa.crue.study.services.GlobalStateManager")
+id = "org.fudaa.fudaa.crue.study.services.GlobalStateManager")
@ActionRegistration(displayName = "#GlobalStateManager")
public final class GlobalStateManager extends AbstractAction implements Presenter.Toolbar {
-
+
CrueService crueService = Lookup.getDefault().lookup(CrueService.class);
private JTextField txtEtu;
private JLabel jlEtu;
@@ -43,13 +45,13 @@
private JLabel jlModelling;
private JTextField txtPost;
private JLabel jlPost;
-
+
public GlobalStateManager() {
crueService.addModellingEMHScenarioLookupListener(new ModellingLookupListener());
crueService.addPostLookupListener(new PostLookupListener());
crueService.addEMHProjetStateLookupListener(new EMHProjetLookupListener());
}
-
+
@Override
public Component getToolbarPresenter() {
txtModelling = new JTextField();
@@ -61,32 +63,38 @@
txtPost = new JTextField();
txtPost.setColumns(45);
txtPost.setEditable(false);
- JPanel panel = new JPanel();
- final FlowLayout layout = new FlowLayout(FlowLayout.LEFT, 0, 0);
- layout.setAlignOnBaseline(true);
-// final LayoutManager layout = new BuHorizontalLayout(0, false, false);
- panel.setLayout(layout);
+
jlEtu = new JLabel(NbBundle.getMessage(GlobalStateManager.class, "GlobalPresenter.EtuState.Text"));
jlEtu.setIcon(CrueIconsProvider.getEtuIcon());
jlModelling = new JLabel(NbBundle.getMessage(GlobalStateManager.class, "GlobalPresenter.ModellingState.Text"));
jlModelling.setIcon(CrueIconsProvider.getIcon(EnumCatEMH.SCENARIO));
-
+
jlPost = new JLabel(NbBundle.getMessage(GlobalStateManager.class, "GlobalPresenter.PostState.Text"));
jlPost.setIcon(CrueIconsProvider.getIconRun());
-
+
Lookup.Template<BooleanStateAction> template = new Lookup.Template<BooleanStateAction>(BooleanStateAction.class,
- ChangeEditStateAction.getActionLookupId(),
- null);
+ ChangeEditStateAction.getActionLookupId(),
+ null);
Lookup.Item<BooleanStateAction> lookupAll = Lookups.forPath(ChangeEditStateAction.getFolderLookup()).lookupItem(template);
- panel.add(lookupAll.getInstance().getToolbarPresenter());
- panel.add(jlEtu);
- panel.add(txtEtu);
-
- panel.add(jlModelling);
- panel.add(txtModelling);
- panel.add(jlPost);
- panel.add(txtPost);
-
+
+ final FlowLayout layout = new FlowLayout(FlowLayout.LEFT, 0, 0);
+ layout.setAlignOnBaseline(true);
+ JPanel pnInfos = new JPanel(layout);
+ pnInfos.add(jlEtu);
+ pnInfos.add(txtEtu);
+
+ pnInfos.add(jlModelling);
+ pnInfos.add(txtModelling);
+ pnInfos.add(jlPost);
+ pnInfos.add(txtPost);
+ final JScrollPane scrollPane = new SimpleScrollPane();
+ scrollPane.setViewportBorder(BorderFactory.createEmptyBorder());
+ scrollPane.setBorder(BorderFactory.createEmptyBorder());
+ scrollPane.setViewportView(pnInfos);
+ final JPanel panel = new JPanel(new BorderLayout());
+ final Component button = lookupAll.getInstance().getToolbarPresenter();
+ panel.add(button, BorderLayout.WEST);
+ panel.add(scrollPane);
final Border separatorBorder = BorderFactory.createEmptyBorder(0, 3, 0, 0);
jlModelling.setBorder(separatorBorder);
jlEtu.setBorder(separatorBorder);
@@ -95,12 +103,12 @@
updateStateModelling();
return panel;
}
-
+
@Override
public void actionPerformed(ActionEvent e) {
//inutile
}
-
+
public void updateStatePost() {
if (txtPost != null) {
boolean postVisible = crueService.isAScenarioLoadedInPostPerspective();
@@ -109,14 +117,14 @@
if (postVisible) {
txtPost.setText(
crueService.getScenarioLoadedInPostPerspective().getNom() + " / " + crueService.getRunLoadedInPostPerspective().getNom());
-
+
} else {
txtPost.setText(StringUtils.EMPTY);
}
txtPost.setToolTipText(txtPost.getText());
}
}
-
+
public void updateStateEtu() {
File file = crueService.getEtuFileLoaded();
if (file == null) {
@@ -144,9 +152,9 @@
}
}
}
-
+
}
-
+
public void updateStateModelling() {
if (txtModelling != null) {
boolean modellingVisible = crueService.isAScenarioLoadedInModellingPerspective();
@@ -158,11 +166,11 @@
txtModelling.setToolTipText(txtModelling.getText());
}
}
-
+
private class ModellingLookupListener implements LookupListener {
-
+
ManagerEMHScenarioNode node;
-
+
@Override
public void resultChanged(LookupEvent ev) {
updateStateModelling();
@@ -183,30 +191,30 @@
oldScenarioCourant.setScenarioCourant(false);
}
projetService.log(NbBundle.getMessage(StudyChangeListenerService.class, "LogScenarioCourantChanged",
- (managerScenarioLoaded == null ? "null" : managerScenarioLoaded.getNom())));
+ (managerScenarioLoaded == null ? "null" : managerScenarioLoaded.getNom())));
projet.setScenarioCourant(managerScenarioLoaded);
projetService.quickSave();
}
} else if (node != null) {
node.setScenarioLoaded(false);
}
-
+
}
}
-
+
private class EMHProjetLookupListener implements LookupListener {
-
+
@Override
public void resultChanged(LookupEvent ev) {
updateStateEtu();
}
}
-
+
private class PostLookupListener implements LookupListener {
-
+
ManagerEMHScenarioNode node;
EMHRunNode runNode;
-
+
@Override
public void resultChanged(LookupEvent ev) {
updateStatePost();
@@ -221,7 +229,7 @@
runNode.setRunLoaded(false);
}
}
-
+
}
}
}
Copied: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/services/GlobalStateManagerRien.java (from rev 7523, trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/services/GlobalStateManager.java)
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/services/GlobalStateManagerRien.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/services/GlobalStateManagerRien.java 2012-08-15 13:26:01 UTC (rev 7552)
@@ -0,0 +1,36 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.fudaa.fudaa.crue.study.services;
+
+import java.awt.Component;
+import java.awt.event.ActionEvent;
+import javax.swing.*;
+import org.openide.awt.ActionID;
+import org.openide.awt.ActionRegistration;
+import org.openide.util.actions.Presenter;
+
+/**
+ * pour pallier un bug de Netbeans lorsque l'on retaille la fenetre.
+ *
+ * @author Frederic Deniger
+ */
+@ActionID(category = "File",
+id = "org.fudaa.fudaa.crue.study.services.GlobalStateManagerRien")
+@ActionRegistration(displayName = "#GlobalStateManagerRien")
+public final class GlobalStateManagerRien extends AbstractAction implements Presenter.Toolbar {
+
+ public GlobalStateManagerRien() {
+ }
+
+ @Override
+ public Component getToolbarPresenter() {
+ return new JLabel(" ");
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ //inutile
+ }
+}
Modified: trunk/soft/fudaa-crue/ui-study/src/main/resources/org/fudaa/fudaa/crue/study/layer.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/resources/org/fudaa/fudaa/crue/study/layer.xml 2012-08-15 13:23:50 UTC (rev 7551)
+++ trunk/soft/fudaa-crue/ui-study/src/main/resources/org/fudaa/fudaa/crue/study/layer.xml 2012-08-15 13:26:01 UTC (rev 7552)
@@ -89,6 +89,12 @@
<attr name="originalFile" stringvalue="Actions/File/org-fudaa-fudaa-crue-study-services-GlobalStateManager.instance"/>
<attr intvalue="1" name="position"/>
</file>
+ <!-- a cause d'un truc bizarre lorsque l'on retaille la fenetre principal. Sans cela, le GlobalStateManagerRien et le
+ SimpleScrollPane ne se retaille pas correctement-->
+ <file name="org-fudaa-fudaa-crue-study-services-GlobalStateManagerRien.shadow">
+ <attr name="originalFile" stringvalue="Actions/File/org-fudaa-fudaa-crue-study-services-GlobalStateManagerRien.instance"/>
+ <attr intvalue="2" name="position"/>
+ </file>
</folder>
</folder>
</filesystem>
Modified: trunk/soft/fudaa-crue/ui-study/src/main/resources/org/fudaa/fudaa/crue/study/services/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/resources/org/fudaa/fudaa/crue/study/services/Bundle.properties 2012-08-15 13:23:50 UTC (rev 7551)
+++ trunk/soft/fudaa-crue/ui-study/src/main/resources/org/fudaa/fudaa/crue/study/services/Bundle.properties 2012-08-15 13:26:01 UTC (rev 7552)
@@ -1,4 +1,5 @@
GlobalStateManager=NonUtile
+GlobalStateManagerRien=NonUtile
GlobalPresenter.ModellingState.Text=Sc\u00e9nario de travail:
GlobalPresenter.EtuState.Text=Fichier \u00e9tude:
GlobalPresenter.PostState.Text=Run exploit\u00e9:
Added: trunk/soft/fudaa-crue/ui-study/src/test/java/TestScrollPane.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/test/java/TestScrollPane.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-study/src/test/java/TestScrollPane.java 2012-08-15 13:26:01 UTC (rev 7552)
@@ -0,0 +1,33 @@
+
+import com.jidesoft.swing.ResizablePanel;
+import com.jidesoft.swing.SimpleScrollPane;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class TestScrollPane {
+
+ public static void main(String[] args) {
+ JPanel pn = new JPanel(new FlowLayout(FlowLayout.LEFT));
+ pn.add(new JLabel("totodddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd"));
+ pn.add(new JLabel("tata"));
+ SimpleScrollPane scroll = new SimpleScrollPane(pn);
+ JFrame frame = new JFrame();
+
+ frame.setContentPane(scroll);
+ frame.setPreferredSize(new Dimension(500, 500));
+ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+ frame.setVisible(true);
+
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
