Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[8125] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2012-12-12 22:49:00
|
Revision: 8125
http://fudaa.svn.sourceforge.net/fudaa/?rev=8125&view=rev
Author: deniger
Date: 2012-12-12 22:48:52 +0000 (Wed, 12 Dec 2012)
Log Message:
-----------
Modified Paths:
--------------
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/resources/org/fudaa/fudaa/crue/common/helper/Bundle.properties
trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/loiff/LoiInfoPanelController.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ModellingListFrottementTopComponent.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DLHYTopComponent.java
trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/services/OpenFileProcess.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/TraceConfiguration.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/TraceConfigurationInfo.java
trunk/soft/fudaa-crue/ui-planimetry/src/test/java/org/fudaa/fudaa/crue/planimetry/ConfigTest.java
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/OpenFichierCrueNodeAction.java
Removed Paths:
-------------
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/OpenFileExec.java
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-12-12 17:43:15 UTC (rev 8124)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/DialogHelper.java 2012-12-12 22:48:52 UTC (rev 8125)
@@ -32,19 +32,19 @@
* @author deniger ( genesis)
*/
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;
@@ -59,34 +59,34 @@
}
}
}
-
+
public static void showDialogAndTable(final CtuluDialogPanel pn, final int dialogOption,
final JXTable table, final String dialogName, final String dialogTitle) {
-
+
final CtuluDialog s = pn.createDialog(WindowManager.getDefault().getMainWindow());
s.setInitParent(WindowManager.getDefault().getMainWindow());
s.setOption(dialogOption);
s.setTitle(dialogTitle);
s.setName(dialogName);
-
+
s.afficheDialogModal(new Runnable() {
@Override
public void run() {
UserPreferencesSaver.loadDialogLocationAndDimension(s);
loadTablePreferencesLater(table);
-
+
}
});
UserPreferencesSaver.saveLocationAndDimension(s);
UserPreferencesSaver.saveTablePreferences(table);
-
+
}
-
+
public static void writeProperties(OutlineView view, String prefix, java.util.Properties p) {
p.setProperty(prefix, "true");
view.getOutline().writeSettings(p, prefix + ".");
}
-
+
public static void writeInPreferences(OutlineView view, String prefix, Class classForPreferences) {
Preferences pref = NbPreferences.forModule(classForPreferences);
Properties prop = new Properties();
@@ -98,7 +98,7 @@
pref.put((String) entry.getKey(), (String) entry.getValue());
}
}
-
+
public static void readInPreferences(OutlineView view, String prefix, Class classForPreferences) {
Preferences pref = NbPreferences.forModule(classForPreferences);
String completePrefix = classForPreferences.getCanonicalName() + "." + prefix;
@@ -118,41 +118,43 @@
Exceptions.printStackTrace(ex);
}
}
-
+
public static void readProperties(OutlineView view, String prefix, java.util.Properties p) {
if ("true".equals(p.getProperty(prefix))) {
view.getOutline().readSettings(p, prefix + ".");
}
}
-
+
public static void showError(Object _msg) {
NotifyDescriptor nd = new NotifyDescriptor.Message(_msg, NotifyDescriptor.ERROR_MESSAGE);
+ nd.setTitle(org.openide.util.NbBundle.getMessage(DialogHelper.class, "Error"));
DialogDisplayer.getDefault().notify(nd);
}
-
+
public static void showError(String title, String _msg) {
NotifyDescriptor nd = new NotifyDescriptor.Message(_msg, NotifyDescriptor.ERROR_MESSAGE);
nd.setTitle(title);
DialogDisplayer.getDefault().notify(nd);
}
-
+
public static void showWarn(String title, String _msg) {
NotifyDescriptor nd = new NotifyDescriptor.Message(_msg, NotifyDescriptor.WARNING_MESSAGE);
nd.setTitle(title);
DialogDisplayer.getDefault().notify(nd);
}
-
+
public static void showWarn(String _msg) {
NotifyDescriptor nd = new NotifyDescriptor.Message(_msg, NotifyDescriptor.WARNING_MESSAGE);
+ nd.setTitle(org.openide.util.NbBundle.getMessage(DialogHelper.class, "Warn"));
DialogDisplayer.getDefault().notify(nd);
}
-
+
public static void showInfo(String title, Object _msg) {
NotifyDescriptor nd = new NotifyDescriptor.Message(_msg, NotifyDescriptor.INFORMATION_MESSAGE);
nd.setTitle(title);
DialogDisplayer.getDefault().notify(nd);
}
-
+
public static void showInfo(final String title, final Object msg, boolean later) {
if (later) {
EventQueue.invokeLater(new Runnable() {
@@ -165,25 +167,25 @@
showInfo(title, msg);
}
}
-
+
public static void show(String title, Object _msg) {
NotifyDescriptor nd = new NotifyDescriptor.Message(_msg, NotifyDescriptor.PLAIN_MESSAGE);
nd.setTitle(title);
DialogDisplayer.getDefault().notify(nd);
}
-
+
public static boolean showQuestion(String msg) {
NotifyDescriptor nd = new NotifyDescriptor.Confirmation(msg);
nd.setOptions(new Object[]{NotifyDescriptor.YES_OPTION, NotifyDescriptor.NO_OPTION});
return DialogDisplayer.getDefault().notify(nd).equals(NotifyDescriptor.YES_OPTION);
}
-
+
public static boolean showQuestion(String title, Object message) {
NotifyDescriptor nd = new NotifyDescriptor.Confirmation(message, title);
nd.setOptions(new Object[]{NotifyDescriptor.YES_OPTION, NotifyDescriptor.NO_OPTION});
return DialogDisplayer.getDefault().notify(nd).equals(NotifyDescriptor.YES_OPTION);
}
-
+
public static boolean showQuestionAndSaveDialogConf(String title, Object message, Class classToSave) {
DialogDescriptor descriptor = new DialogDescriptor(message, title);
return showQuestionAndSaveDialogConf(descriptor, classToSave);
@@ -202,7 +204,7 @@
nd.setOptions(options);
return DialogDisplayer.getDefault().notify(nd);
}
-
+
public static UserSaveAnswer confirmSaveOrNot() {
return confirmSaveOrNot(
NbBundle.getMessage(DialogHelper.class, "SaveDialog.Title"), NbBundle.getMessage(DialogHelper.class,
@@ -210,13 +212,13 @@
NbBundle.getMessage(DialogHelper.class, "SaveDialog.SaveAction"),
NbBundle.getMessage(DialogHelper.class, "SaveDialog.DontSaveAction"));
}
-
+
public static UserSaveAnswer confirmSaveOrNot(String title, Object message, String messageSave, String messageNotSave) {
-
+
return confirmSaveOrNot(title, message, messageSave, messageNotSave, NbBundle.getMessage(DialogHelper.class,
"dialog.cancel.label"));
}
-
+
public static UserSaveAnswer confirmSaveOrNot(String title, Object message, String messageSave, String messageNotSave,
String cancelMessage) {
assert !cancelMessage.equals(messageNotSave);
@@ -239,7 +241,7 @@
nd.setOptions(new Object[]{NotifyDescriptor.YES_OPTION, NotifyDescriptor.NO_OPTION, NotifyDescriptor.CANCEL_OPTION});
return DialogDisplayer.getDefault().notify(nd);
}
-
+
public static boolean showQuestionOkCancel(String title, Object _msg) {
NotifyDescriptor nd = new NotifyDescriptor.Confirmation(_msg, title);
nd.setOptions(new Object[]{NotifyDescriptor.OK_OPTION, NotifyDescriptor.CANCEL_OPTION});
@@ -255,11 +257,11 @@
public static boolean isCancelOption(Object in) {
return NotifyDescriptor.CANCEL_OPTION.equals(in) || NotifyDescriptor.CLOSED_OPTION.equals(in);
}
-
+
public static boolean isYesOption(Object in) {
return NotifyDescriptor.YES_OPTION.equals(in);
}
-
+
public static boolean isNoOption(Object in) {
return NotifyDescriptor.NO_OPTION.equals(in);
}
@@ -272,16 +274,16 @@
nd.setOptions(new Object[]{NotifyDescriptor.YES_OPTION, NotifyDescriptor.NO_OPTION, NotifyDescriptor.CANCEL_OPTION});
return DialogDisplayer.getDefault().notify(nd);
}
-
+
public static void showNotifyOperationTermine(String details) {
showNotifyOperationTermine(NbBundle.getMessage(DialogHelper.class, "NotifyOperationSucceed"), details);
}
-
+
public static void showNotifyOperationTermine(String title, String details) {
NotificationDisplayer.getDefault().notify(title, CrueIconsProvider.getIcon("org/fudaa/fudaa/crue/common/icons/ok.png"),
details, null);
}
-
+
protected static void loadTablePreferencesLater(final JXTable table) {
EventQueue.invokeLater(new Runnable() {
@Override
@@ -290,7 +292,7 @@
}
});
}
-
+
public static boolean showQuestionAndSaveDialogConf(DialogDescriptor descriptor, Class classToSave) {
JDialog createDialog = (JDialog) DialogDisplayer.getDefault().createDialog(descriptor);
createDialog.pack();
Modified: trunk/soft/fudaa-crue/ui-common/src/main/resources/org/fudaa/fudaa/crue/common/helper/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/resources/org/fudaa/fudaa/crue/common/helper/Bundle.properties 2012-12-12 17:43:15 UTC (rev 8124)
+++ trunk/soft/fudaa-crue/ui-common/src/main/resources/org/fudaa/fudaa/crue/common/helper/Bundle.properties 2012-12-12 22:48:52 UTC (rev 8125)
@@ -15,3 +15,5 @@
ChangeName.Empty.Error=Le nom est vide
NewName.Label=Nom
NewName.DialogTitle=Choisir un nom
+Error=Erreur
+Warn=Avertissement
Modified: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/loiff/LoiInfoPanelController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/loiff/LoiInfoPanelController.java 2012-12-12 17:43:15 UTC (rev 8124)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/loiff/LoiInfoPanelController.java 2012-12-12 22:48:52 UTC (rev 8125)
@@ -1,6 +1,7 @@
package org.fudaa.fudaa.crue.loi.loiff;
import com.memoire.bu.BuGridLayout;
+import java.awt.BorderLayout;
import java.awt.FlowLayout;
import javax.swing.JLabel;
import javax.swing.JPanel;
@@ -45,6 +46,7 @@
lbTypeControlLoi = new JLabel(NbBundle.getMessage(LoiMessages.class, "TypeControleLoi.Label"));
lbExtrapolInf = new JLabel(NbBundle.getMessage(LoiMessages.class, "ExtrapolInf.Label"));
lbExtrapolSup = new JLabel(NbBundle.getMessage(LoiMessages.class, "ExtrapolSup.Label"));
+
lbAbscisseValidityContent = new JLabel();
lbAbscisseValidity = new JLabel(NbBundle.getMessage(LoiMessages.class, "AbscisseValidity.Label"));
lbOrdonneValidityContent = new JLabel();
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ModellingListFrottementTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ModellingListFrottementTopComponent.java 2012-12-12 17:43:15 UTC (rev 8124)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ModellingListFrottementTopComponent.java 2012-12-12 22:48:52 UTC (rev 8125)
@@ -89,7 +89,7 @@
boolean modified = false;
for (LineContent lineContent : lines) {
List<ColumnContent> components = lineContent.getComponents();
- for (int i = 1; i < components.size(); i++) {//la première colonne est le titre
+ for (int i = 2; i < components.size(); i++) {//la première colonne est le branche puis le titre
ColumnContent<JComboBox> content = components.get(i);
List<JComboBox> cbs = content.getComponents();
for (JComboBox jComboBox : cbs) {
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DLHYTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DLHYTopComponent.java 2012-12-12 17:43:15 UTC (rev 8124)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DLHYTopComponent.java 2012-12-12 22:48:52 UTC (rev 8125)
@@ -142,7 +142,7 @@
add(splitPane);
JPanel nomComment = new JPanel(new BuGridLayout(3, 10, 10));
- nomComment.add(new JLabel(NbBundle.getMessage(DLHYTopComponent.class, "Nom.DisplayName")));
+
final DocumentListener documentListener = super.createDocumentListener();
DocumentListener nameChanged = new DocumentListener() {
@Override
@@ -162,17 +162,25 @@
};
txtNom = new JTextField(30);
lbNomValidation = new JLabel();
+
+ //ligne 1
+ nomComment.add(new JLabel(NbBundle.getMessage(DLHYTopComponent.class, "Nom.DisplayName")));
nomComment.add(txtNom);
nomComment.add(lbNomValidation);
- nomComment.add(new JLabel(NbBundle.getMessage(DLHYTopComponent.class, "Commentaire.DisplayName")));
+
txtCommentaire = new JTextField(30);
txtCommentaire.setEditable(false);
txtCommentaire.getDocument().addDocumentListener(documentListener);
txtNom.getDocument().addDocumentListener(documentListener);
txtNom.getDocument().addDocumentListener(nameChanged);
+ //ligne 2
+ nomComment.add(new JLabel(NbBundle.getMessage(DLHYTopComponent.class, "Commentaire.DisplayName")));
nomComment.add(txtCommentaire);
+ nomComment.add(new JLabel());
+
+ dateDeb = new DateDebEditor();
+ //ligne 3
nomComment.add(new JLabel(NbBundle.getMessage(DLHYTopComponent.class, "DateDebut.DisplayName")));
- dateDeb = new DateDebEditor();
nomComment.add(dateDeb.getPn());
JPanel pnInfo = new JPanel(new BorderLayout(5, 5));
pnInfo.add(loiUiController.getInfoController().getPanel());
@@ -210,7 +218,6 @@
return new TableExportCommentSupplier(false).getComments(getName());
}
-
@Override
protected void componentOpenedHandler() {
super.componentOpenedHandler();
Modified: trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/services/OpenFileProcess.java
===================================================================
--- trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/services/OpenFileProcess.java 2012-12-12 17:43:15 UTC (rev 8124)
+++ trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/services/OpenFileProcess.java 2012-12-12 22:48:52 UTC (rev 8125)
@@ -1,13 +1,8 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
package org.fudaa.fudaa.crue.options.services;
import java.awt.EventQueue;
import java.io.File;
import java.util.List;
-import java.util.MissingResourceException;
import org.apache.commons.lang.StringUtils;
import org.fudaa.dodico.calcul.CalculExec;
import org.fudaa.dodico.calcul.CalculExecDefault;
@@ -27,9 +22,10 @@
ConfigurationManagerService configurationManagerService = Lookup.getDefault().lookup(ConfigurationManagerService.class);
- @Messages({"OpenFichier.EditorFileIsNotConfigured=Vous devez ouvrir les options ( Menu Outils) pour configurer l'\u00e9diteur \u00e0 utiliser", "#Echec ouverture editeur externe",
- "ExterneEditorFailed=<html><body>L''\u00e9diteur externe ne peut pas \u00eatre lanc\u00e9. L''\u00e9diteur utilis\u00e9e est:<br><ul><li>{0}</li></ul></body></html>", "OpenFile.Error=Erreur: ouverture d'un fichier"})
- public void openFiles(final List<File> files) throws MissingResourceException {
+ @Messages({"OpenFichier.EditorFileIsNotConfigured=Vous devez ouvrir les options ( Menu Outils) pour configurer l'\u00e9diteur \u00e0 utilisé",
+ "ExterneEditorFailed=<html><body>L''\u00e9diteur externe ne peut pas \u00eatre lanc\u00e9. L''\u00e9diteur utilis\u00e9 est:<br><ul><li>{0}</li></ul></body></html>",
+ "OpenFile.Error=Erreur: ouverture d'un fichier"})
+ public void openFiles(final List<File> files) {
final Option option = configurationManagerService.getOptionsManager().getOption(OptionsEnum.EDITOR);
if (option == null || StringUtils.isEmpty(option.getValeur())) {
DialogHelper.showError(OpenFile_Error(), OpenFichier_EditorFileIsNotConfigured());
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/TraceConfiguration.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/TraceConfiguration.java 2012-12-12 17:43:15 UTC (rev 8124)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/TraceConfiguration.java 2012-12-12 22:48:52 UTC (rev 8125)
@@ -17,7 +17,6 @@
*/
public class TraceConfiguration extends AbstractLigneBriseeConfiguration {
- public static final String PROPERTY_ANGLE_IN_DEGREE = "angleInDegree";
public static final String PROPERTY_PROFIL_VUE_DE_AMONT = "profilVueDeAmont";
public static final String PROPERTY_SECTION_LABEL_POSITION = "sectionLabelPosition";
TraceLigneModel lineModel = new TraceLigneModel(TraceLigne.LISSE, 1.5f, Color.BLACK);
@@ -26,7 +25,7 @@
LabelConfiguration sectionLabelConfiguration = new LabelConfiguration();
private final VisuConfiguration parent;
boolean profilVueDeAmont = false;
- private int angleInDegree = 30;
+ private int angleInDegree = 0;
int sectionLabelPosition = SwingConstants.RIGHT;
public TraceConfiguration(VisuConfiguration parent) {
@@ -110,10 +109,6 @@
return getSectionLabelConfiguration().isDisplayLabels();
}
- public void setAngleInDegree(int angleInDegree) {
- this.angleInDegree = angleInDegree;
- }
-
public String getDisplayName(DonPrtGeoProfilSection profilSection, PlanimetryTraceLayerModel modeleDonnees, boolean selected) {
String nom = null;
if (modeleDonnees.getTraceConfigurationExtra() != null) {
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/TraceConfigurationInfo.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/TraceConfigurationInfo.java 2012-12-12 17:43:15 UTC (rev 8124)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/TraceConfigurationInfo.java 2012-12-12 22:48:52 UTC (rev 8125)
@@ -4,11 +4,9 @@
import java.util.ArrayList;
import java.util.List;
import java.util.MissingResourceException;
-import javax.swing.SpinnerNumberModel;
import javax.swing.SwingConstants;
import org.fudaa.fudaa.crue.common.editor.CodeTranslation;
import org.fudaa.fudaa.crue.common.editor.JcomboBoxIntegerInplaceEditor;
-import org.fudaa.fudaa.crue.common.editor.SpinnerInplaceEditor;
import org.fudaa.fudaa.crue.planimetry.configuration.editor.SectionPositionPropertyEditorSupport;
import org.openide.nodes.PropertySupport;
import org.openide.nodes.PropertySupport.Reflection;
@@ -35,12 +33,6 @@
try {
set.put(ConfigurationInfoHelper.create(TraceConfiguration.PROPERTY_PROFIL_VUE_DE_AMONT, Boolean.TYPE, in,
"TraceConfiguration.profilVueDeAmont", VisuConfigurationInfo.class));
- final Reflection angleProperty = ConfigurationInfoHelper.create(TraceConfiguration.PROPERTY_ANGLE_IN_DEGREE, Integer.TYPE,
- in,
- "TraceConfiguration.angle", VisuConfigurationInfo.class);
- SpinnerInplaceEditor inplaceEditor = new SpinnerInplaceEditor(new SpinnerNumberModel(0, -90, 90, 1));
- angleProperty.setValue("inplaceEditor", inplaceEditor);
- set.put(angleProperty);
set.setDisplayName(NbBundle.getMessage(TraceConfigurationInfo.class, "TraceConfiguration.DisplayName"));
set.setShortDescription(set.getDisplayName());
res.add(set);
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/test/java/org/fudaa/fudaa/crue/planimetry/ConfigTest.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/test/java/org/fudaa/fudaa/crue/planimetry/ConfigTest.java 2012-12-12 17:43:15 UTC (rev 8124)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/test/java/org/fudaa/fudaa/crue/planimetry/ConfigTest.java 2012-12-12 22:48:52 UTC (rev 8125)
@@ -50,7 +50,6 @@
res.add("traces.visible");
res.add("traces.transparenceAlpha");
res.add("traces.profilVueDeAmont");
- res.add("traces.angleInDegree");
res.add("traces.line.typeTrait");
res.add("traces.line.epaisseur");
res.add("traces.line.couleur");
Modified: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/OpenFichierCrueNodeAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/OpenFichierCrueNodeAction.java 2012-12-12 17:43:15 UTC (rev 8124)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/OpenFichierCrueNodeAction.java 2012-12-12 22:48:52 UTC (rev 8125)
@@ -11,6 +11,7 @@
import org.apache.commons.lang.ArrayUtils;
import org.fudaa.dodico.crue.metier.etude.FichierCrue;
import org.fudaa.fudaa.crue.common.node.NodeHelper;
+import org.fudaa.fudaa.crue.options.services.OpenFileProcess;
import org.fudaa.fudaa.crue.study.services.EMHProjetServiceImpl;
import org.openide.nodes.Node;
import org.openide.util.HelpCtx;
@@ -24,7 +25,7 @@
*/
public class OpenFichierCrueNodeAction extends NodeAction {
- private final OpenFileExec nodeAction = new OpenFileExec();
+ private final OpenFileProcess nodeAction = new OpenFileProcess();
EMHProjetServiceImpl projetService = Lookup.getDefault().lookup(EMHProjetServiceImpl.class);
@Override
Deleted: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/OpenFileExec.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/OpenFileExec.java 2012-12-12 17:43:15 UTC (rev 8124)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/OpenFileExec.java 2012-12-12 22:48:52 UTC (rev 8125)
@@ -1,89 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-package org.fudaa.fudaa.crue.study.actions;
-
-import java.awt.EventQueue;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.MissingResourceException;
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
-import org.fudaa.dodico.calcul.CalculExec;
-import org.fudaa.dodico.calcul.CalculExecDefault;
-import org.fudaa.dodico.crue.projet.conf.Option;
-import org.fudaa.dodico.crue.projet.conf.OptionsEnum;
-import org.fudaa.fudaa.crue.common.helper.DialogHelper;
-import org.fudaa.fudaa.crue.common.helper.UiContext;
-import org.fudaa.fudaa.crue.options.services.ConfigurationManagerService;
-import org.openide.nodes.Node;
-import org.openide.util.Lookup;
-import org.openide.util.NbBundle;
-
-/**
- *
- * @author genesis
- */
-public class OpenFileExec {
-
- ConfigurationManagerService configurationManagerService = Lookup.getDefault().lookup(ConfigurationManagerService.class);
-
- public void openFiles(final List<File> files) throws MissingResourceException {
- final Option option = configurationManagerService.getOptionsManager().getOption(OptionsEnum.EDITOR);
- if (option == null || StringUtils.isEmpty(option.getValeur())) {
- DialogHelper.showError(NbBundle.getMessage(OpenFileExec.class, "OpenFichierAction.Name"), NbBundle.getMessage(OpenFileExec.class, "OpenFichier.EditorFileIsNotConfigured"));
- }
- final CalculExec exec = new CalculExecDefault(new String[]{option.getValeur()});
- exec.setLauchInNewTerm(false);
- exec.setStartCmdUse(false);
- exec.setShowErrorInUI(false);
- exec.setUI(new UiContext());
- new Thread() {
- @Override
- public void run() {
- boolean launch = true;
- for (File file : files) {
- launch = exec.launch(file, null);
- if (!launch) {
- break;
- }
- }
- if (!launch) {
- EventQueue.invokeLater(new Runnable() {
- @Override
- public void run() {
- DialogHelper.showError(org.openide.util.NbBundle.getMessage(OpenFileExec.class, "ExterneEditorFailed", option.getValeur()));
- }
- });
-
- }
- }
- }.start();
- }
-
- protected boolean enable(Node[] activatedNodes) {
- if (ArrayUtils.isEmpty(activatedNodes)) {
- return false;
- }
- for (Node node : activatedNodes) {
- File fichier = node.getLookup().lookup(File.class);
- if (fichier != null && fichier.isFile()) {
- return true;
- }
- }
- return false;
- }
-
- protected void performAction(Node[] activatedNodes) {
- final List<File> files = new ArrayList<File>();
- for (Node node : activatedNodes) {
- File fichier = node.getLookup().lookup(File.class);
- if (fichier != null && fichier.isFile()) {
- files.add(fichier);
- }
- }
- openFiles(files);
- }
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
