Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[8559] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2014-01-07 20:14:42
|
Revision: 8559
http://sourceforge.net/p/fudaa/svn/8559
Author: deniger
Date: 2014-01-07 20:14:39 +0000 (Tue, 07 Jan 2014)
Log Message:
-----------
CRUE-609 lors de l'export d'un shapefile, les identifiants sont utilis?\195?\169es et plus les noms complets. Cela occasionne des conflits ?\195?\160 l'import.
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/CtuluUIForNetbeans.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryGisEditor.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/AbstractSigLoaderAction.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/SigLoaderAction.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/resources/org/fudaa/fudaa/crue/planimetry/action/Bundle.properties
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/CtuluUIForNetbeans.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/CtuluUIForNetbeans.java 2014-01-06 22:29:59 UTC (rev 8558)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/CtuluUIForNetbeans.java 2014-01-07 20:14:39 UTC (rev 8559)
@@ -2,6 +2,7 @@
import java.awt.Component;
import java.util.Collection;
+import java.util.logging.Level;
import java.util.logging.LogRecord;
import org.apache.commons.lang.StringUtils;
import org.fudaa.ctulu.CtuluAnalyze;
@@ -72,7 +73,8 @@
@Override
public void error(String _titre, String _msg, boolean _tempo) {
if (_tempo) {
- NotificationDisplayer.getDefault().notify(_titre, CrueIconsProvider.getIcon("org/fudaa/fudaa/crue/common/icons/erreur-non-bloquante.png"), _msg, null);
+ NotificationDisplayer.getDefault().notify(_titre, CrueIconsProvider.getIcon("org/fudaa/fudaa/crue/common/icons/erreur-non-bloquante.png"), _msg,
+ null);
} else {
DialogHelper.showError(_titre, _msg);
}
@@ -104,7 +106,16 @@
log.setDesc(_analyze.getDesci18n());
Collection<LogRecord> records = _analyze.getRecords();
for (LogRecord logRecord : records) {
- log.addRecord(CtuluLogLevel.WARNING, logRecord.getMessage());
+ Level level = logRecord.getLevel();
+ CtuluLogLevel targetLevel = CtuluLogLevel.ERROR;
+ if (level.equals(Level.WARNING)) {
+ targetLevel = CtuluLogLevel.WARNING;
+ } else if (level.equals(CtuluAnalyze.FATAL)) {
+ targetLevel = CtuluLogLevel.FATAL;
+ } else if (level.equals(Level.INFO)) {
+ targetLevel = CtuluLogLevel.INFO;
+ }
+ log.addRecord(targetLevel, logRecord.getMessage());
}
LogsDisplayer.displayError(log, _analyze.getDesci18n());
return _analyze.containsFatalError();
@@ -136,9 +147,11 @@
public void message(String _titre, String _msg, boolean _tempo) {
if (_tempo) {
if (_titre == null && _msg != null) {
- NotificationDisplayer.getDefault().notify(_msg, CrueIconsProvider.getIcon("org/fudaa/fudaa/crue/common/icons/information.png"), StringUtils.EMPTY, null);
+ NotificationDisplayer.getDefault().notify(_msg, CrueIconsProvider.getIcon("org/fudaa/fudaa/crue/common/icons/information.png"),
+ StringUtils.EMPTY, null);
} else {
- NotificationDisplayer.getDefault().notify(StringUtils.defaultString(_titre), CrueIconsProvider.getIcon("org/fudaa/fudaa/crue/common/icons/information.png"), StringUtils.defaultString(_msg), null);
+ NotificationDisplayer.getDefault().notify(StringUtils.defaultString(_titre), CrueIconsProvider.getIcon(
+ "org/fudaa/fudaa/crue/common/icons/information.png"), StringUtils.defaultString(_msg), null);
}
} else {
DialogHelper.showInfo(_titre, _msg);
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryGisEditor.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryGisEditor.java 2014-01-06 22:29:59 UTC (rev 8558)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryGisEditor.java 2014-01-07 20:14:39 UTC (rev 8559)
@@ -14,5 +14,6 @@
public PlanimetryGisEditor(ZEbliCalquesPanel _panel) {
super(_panel, new PlanimetrySceneEditor(_panel.getScene(), _panel));
+ setExportWithId(true);
}
}
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/AbstractSigLoaderAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/AbstractSigLoaderAction.java 2014-01-06 22:29:59 UTC (rev 8558)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/AbstractSigLoaderAction.java 2014-01-07 20:14:39 UTC (rev 8559)
@@ -32,7 +32,7 @@
*/
public abstract class AbstractSigLoaderAction extends EbliActionSimple {
- final PlanimetryController controller;
+ final PlanimetryController controller;
public AbstractSigLoaderAction(String name, PlanimetryController controller) {
super(name, null, name.toUpperCase());
@@ -67,15 +67,19 @@
protected final void loadData(final FSigFileLoaderI loader,
final Pair<File, BuFileFilter> file, final EnumFormat fmt) {
-
ProgressRunnable<Pair<GISZoneCollectionPoint, GISZoneCollectionLigneBrisee>> worker = new ProgressRunnable<Pair<GISZoneCollectionPoint, GISZoneCollectionLigneBrisee>>() {
@Override
public Pair<GISZoneCollectionPoint, GISZoneCollectionLigneBrisee> run(ProgressHandle ph) {
ph.switchToIndeterminate();
FSigFileLoadResult result = new FSigFileLoadResult();
CtuluAnalyze analyse = new CtuluAnalyze();
- loader.setInResult(result, file.first, file.first.getAbsolutePath(), CtuluUIForNetbeans.DEFAULT.getMainProgression(),
- analyse);
+ try {
+ loader.setInResult(result, file.first, file.first.getAbsolutePath(), CtuluUIForNetbeans.DEFAULT.getMainProgression(),
+ analyse);
+ } catch (IllegalArgumentException ex) {
+ analyse.addFatalError(org.openide.util.NbBundle.getMessage(AbstractSigLoaderAction.class, "sig.import.error", ex.getMessage()));
+ }
+
if (CtuluUIForNetbeans.DEFAULT.manageAnalyzeAndIsFatal(analyse)) {
return null;
}
@@ -93,7 +97,8 @@
return new Pair<GISZoneCollectionPoint, GISZoneCollectionLigneBrisee>(pt, lignes);
}
};
- Pair<GISZoneCollectionPoint, GISZoneCollectionLigneBrisee> showProgressDialogAndRun = CrueProgressUtils.showProgressDialogAndRun(worker, getTitle());
+ Pair<GISZoneCollectionPoint, GISZoneCollectionLigneBrisee> showProgressDialogAndRun = CrueProgressUtils.showProgressDialogAndRun(worker,
+ getTitle());
finishImportData(showProgressDialogAndRun, file.first, fmt);
}
@@ -127,5 +132,6 @@
}
}
- protected abstract void finishImportData(Pair<GISZoneCollectionPoint, GISZoneCollectionLigneBrisee> showProgressDialogAndRun, File file, EnumFormat fmt);
+ protected abstract void finishImportData(Pair<GISZoneCollectionPoint, GISZoneCollectionLigneBrisee> showProgressDialogAndRun, File file,
+ EnumFormat fmt);
}
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/SigLoaderAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/SigLoaderAction.java 2014-01-06 22:29:59 UTC (rev 8558)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/SigLoaderAction.java 2014-01-07 20:14:39 UTC (rev 8559)
@@ -5,6 +5,10 @@
import javax.swing.Action;
import javax.swing.JCheckBox;
import javax.swing.JPanel;
+import org.fudaa.ctulu.editor.CtuluValueEditorDouble;
+import org.fudaa.ctulu.gis.GISAttribute;
+import org.fudaa.ctulu.gis.GISAttributeDouble;
+import org.fudaa.ctulu.gis.GISAttributeInterface;
import org.fudaa.ctulu.gis.GISZoneCollectionLigneBrisee;
import org.fudaa.ctulu.gis.GISZoneCollectionPoint;
import org.fudaa.dodico.crue.common.Pair;
@@ -70,12 +74,29 @@
}
if (importPoint) {
+ GISAttributeInterface[] attributes = points.getAttributes();
+ setNotEditable(attributes);
controller.getGroupExternController().addLayerPointUnmodifiable(points, file, fmt, type);
}
if (importLigne) {
+ GISAttributeInterface[] attributes = lignes.getAttributes();
+ setNotEditable(attributes);
controller.getGroupExternController().addLayerLignesUnmodifiable(lignes, file, fmt, type);
}
}
-
+ protected void setNotEditable(GISAttributeInterface[] attributes) {
+ if (attributes != null) {
+ for (GISAttributeInterface attribute : attributes) {
+ if (attribute != null) {
+ if (Double.class.equals(attribute.getDataClass())) {
+ ((GISAttribute) attribute).setInternEditor(new CtuluValueEditorDouble(false));
+ }
+ attribute.getEditor().setEditable(false);
+ }
+
+ }
+ }
+ }
+
}
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/resources/org/fudaa/fudaa/crue/planimetry/action/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/resources/org/fudaa/fudaa/crue/planimetry/action/Bundle.properties 2014-01-06 22:29:59 UTC (rev 8558)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/resources/org/fudaa/fudaa/crue/planimetry/action/Bundle.properties 2014-01-07 20:14:39 UTC (rev 8559)
@@ -34,3 +34,4 @@
SimplifyProfils.Name=Simplifier les profils
importJGW.action=Importer une image g\u00e9or\u00e9f\u00e9renc\u00e9e (JGW)
jgwFileNotFound.text=Le fichier de g\u00e9or\u00e9f\u00e9rencement {0} n''a pas \u00e9t\u00e9 trouv\u00e9
+sig.import.error=Erreur lors de l''import: {0}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
