Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[5986] trunk/framework
|
From: <de...@us...> - 2010-10-18 21:36:46
|
Revision: 5986
http://fudaa.svn.sourceforge.net/fudaa/?rev=5986&view=rev
Author: deniger
Date: 2010-10-18 21:36:39 +0000 (Mon, 18 Oct 2010)
Log Message:
-----------
Modified Paths:
--------------
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluAnalyze.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxe.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeVertical.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGFillePanel.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGraphe.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGPaletteLegendeGraphe.java
trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/controle/BConfigurePaletteAction.java
trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/controle/BConfigureSectionBuilder.java
trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluAnalyze.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluAnalyze.java 2010-10-18 21:36:11 UTC (rev 5985)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluAnalyze.java 2010-10-18 21:36:39 UTC (rev 5986)
@@ -31,6 +31,10 @@
*/
public class CtuluAnalyze {
+ public static final Level ERROR = Level.SEVERE;
+
+ public static Level FATAL = Level.ALL;
+
/**
* Constructeur par d\xE9faut
*/
@@ -133,7 +137,7 @@
* @param _m le message
*/
public void addFatalError(final String _m) {
- addError(_m);
+ addRecord(FATAL, _m);
}
/**
@@ -143,7 +147,7 @@
* @param _index le num de ligne
*/
public void addFatalError(final String _m, final int _index) {
- addErrorFromFile(_m, _index);
+ addRecord(FATAL, _m, Integer.valueOf(_index));
}
/**
@@ -151,7 +155,7 @@
* @param arg
*/
public void addFatalError(final String _m, final Object... arg) {
- addError(_m, arg);
+ addRecord(FATAL, _m, arg);
}
/**
@@ -161,7 +165,7 @@
* @param _in pour recuperer le num de ligne
*/
public void addFatalError(final String _m, final LineNumberReader _in) {
- addErrorFromFile(_m, _in);
+ addFatalError(_m, _in == null ? -1 : _in.getLineNumber());
}
/**
@@ -275,6 +279,10 @@
logs.clear();
}
+ public boolean containsErrorOrFatalError() {
+ return containsErrors() || containsFatalError();
+ }
+
/**
* @return true si contient au moins une erreur
*/
@@ -286,7 +294,7 @@
* @return true si contient une erreur fatale
*/
public boolean containsFatalError() {
- return containsErrors();
+ return containsLevel(FATAL);
}
/**
@@ -308,17 +316,6 @@
}
/**
- * @param l le level a tester
- * @return true si au moins un message et de niveau l.
- */
- private LogRecord getFirstOfLevel(final Level l) {
- for (final LogRecord log : logs) {
- if (l.equals(log.getLevel())) { return log; }
- }
- return null;
- }
-
- /**
* @return true si contient au moins un avertissement
*/
public boolean containsWarnings() {
@@ -339,11 +336,6 @@
return desc;
}
- public String getDesci18n() {
- if (defaultResourceBundle == null) return desc;
- return defaultResourceBundle.getString(desc);
- }
-
/**
* @return l'ensemble des enregistrements de log
*/
@@ -362,12 +354,24 @@
* @return le resume de l'analyse
*/
public String getResume() {
- return getDesci18n() + "\n" + CtuluDefaultLogFormatter.format(logs);
+ return getDesc() + "\n" + CtuluDefaultLogFormatter.format(logs);
}
-
- public String getWarnResume() {
- return getDesci18n() + "\n" + CtuluDefaultLogFormatter.format(filter(Level.WARNING));
+
+ public String getFatalError() {
+ LogRecord log = getFirstOfLevel(Level.SEVERE);
+ return log == null ? null : CtuluDefaultLogFormatter.DEFAULT.format(log);
}
+
+ /**
+ * @param l le level a tester
+ * @return true si au moins un message et de niveau l.
+ */
+ private LogRecord getFirstOfLevel(final Level l) {
+ for (final LogRecord log : logs) {
+ if (l.equals(log.getLevel())) { return log; }
+ }
+ return null;
+ }
/**
* @return true si vide
@@ -376,6 +380,10 @@
return logs.isEmpty();
}
+ public boolean isNotEmpty() {
+ return !isEmpty();
+ }
+
/**
* @param _e l'exception a ajouter a l'anayse
*/
@@ -389,7 +397,7 @@
*/
public void manageException(final Exception _e, final String msg) {
addRecord(Level.SEVERE, msg).setThrown(_e);
- // _e.printStackTrace();
+ _e.printStackTrace();
}
/**
@@ -433,26 +441,13 @@
public void manageExceptionFromFile(final Exception _e, final String msg, final int line) {
addRecord(Level.SEVERE, msg, line).setThrown(_e);
}
+
- public String getFatalError() {
- LogRecord log = getFirstOfLevel(Level.SEVERE);
- return log == null ? null : CtuluDefaultLogFormatter.DEFAULT.format(log);
-
+ public String getDesci18n() {
+ if (defaultResourceBundle == null) return desc;
+ return defaultResourceBundle.getString(desc);
}
- private List<LogRecord> filter(Level l) {
- List<LogRecord> res = new ArrayList<LogRecord>();
- for (LogRecord logRecord : logs) {
- if (logRecord.getLevel().equals(l)) res.add(logRecord);
- }
- return res;
- }
-
- public String getErrorResume() {
- return CtuluDefaultLogFormatter.format(filter(Level.SEVERE));
-
- }
-
/**
* Ajoute tous les canaux de l'analyse passee en parametres. Les pointeurs sont copiees.
*
@@ -460,6 +455,7 @@
*/
public void merge(final CtuluAnalyze _analyze) {
setDesc(_analyze.getDesc());
+ setDefaultResourceBundle(_analyze.getDefaultResourceBundle());
setResource(_analyze.getResource());
logs.addAll(_analyze.logs);
}
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxe.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxe.java 2010-10-18 21:36:11 UTC (rev 5985)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxe.java 2010-10-18 21:36:39 UTC (rev 5986)
@@ -218,7 +218,8 @@
axisIterator_.initExactFromDist(getMinimum(), getMaximum(), longueurPas_, nbSousGraduations_ + 1);
} else if (modeGraduations_ == AUTO_LONGUEURPAS) {
- axisIterator_.init(getMinimum(), getMaximum(), (int) ((getMaximum() - getMinimum()) / longueurPas_));
+ int nbIteration = (int) ((getMaximum() - getMinimum()) / longueurPas_);
+ axisIterator_.init(getMinimum(), getMaximum(), nbIteration);
} else if (modeGraduations_ == AUTO_GRADUATIONS) {
axisIterator_.init(getMinimum(), getMaximum(), nbPas_);
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeVertical.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeVertical.java 2010-10-18 21:36:11 UTC (rev 5985)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeVertical.java 2010-10-18 21:36:39 UTC (rev 5986)
@@ -111,7 +111,7 @@
for (final TickIterator it = iterator; it.hasNext(); it.next()) {
final double s = it.currentValue();
- final int ye = _t.getYEcran(it.currentValue(), this);
+ final int ye = _t.getYEcran(s, this);
if (graduations_) {
if (it.isMajorTick()) {
if (traceGrille_) {
@@ -217,7 +217,7 @@
if (droite_) {
_g2d.drawString(t, xTxt, yf - fm.getDescent());
} else {
- _g2d.drawString(t, xTxt, yf - fm.getDescent() - maxStringwidth - 8);
+ _g2d.drawString(t, xTxt, yf - fm.getDescent() - maxStringwidth - 1);
}
}
@@ -261,8 +261,7 @@
final FontMetrics fm = _g2d.getFontMetrics(this.font_);
if (graduations_ || isGridPainted()) {
// la graduation
- r += 20;
-
+ r += 4;
int maxChaine = 0;
final TickIterator iterator = buildUpToDateMainTickIterator();
for (final TickIterator it = iterator; it.hasNext(); it.next()) {
@@ -279,16 +278,16 @@
}
}
}
- r += (maxChaine + 4);
+ r += maxChaine;
}
if (isUniteVisible() || isTitreVisible()) {
if (titreVertical_) {
- r += fm.getHeight() + 1;
+ r += fm.getHeight() + 6;
} else {
final String axeTexte = getAxeTexte();
// System.err.println("HYAYHAH: axeTexte=" + axeTexte);
final int wT = fm.stringWidth(axeTexte) + 4;
- r += wT / 2;
+ r = Math.max(r, wT);
}
}
return r;
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGFillePanel.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGFillePanel.java 2010-10-18 21:36:11 UTC (rev 5985)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGFillePanel.java 2010-10-18 21:36:39 UTC (rev 5986)
@@ -1,8 +1,12 @@
/*
* @creation 24 juin 2004
+ *
* @modification $Date: 2007-05-22 14:19:04 $
+ *
* @license GNU General Public License 2
+ *
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ *
* @mail de...@fu...
*/
package org.fudaa.ebli.courbe;
@@ -41,6 +45,7 @@
import org.fudaa.ctulu.CtuluListSelectionInterface;
import org.fudaa.ctulu.CtuluListSelectionListener;
import org.fudaa.ctulu.CtuluSelectionInterface;
+import org.fudaa.ctulu.gui.CtuluLibSwing;
import org.fudaa.ctulu.image.CtuluImageProducer;
import org.fudaa.ebli.commun.*;
import org.fudaa.ebli.palette.BPaletteInfoAbstractAction;
@@ -196,18 +201,18 @@
// actionForGroup.add(act);
}
- // r.add(new EGConfigureActionPalette(vue_.graphe_.getModel()));
+ // r.add(new EGConfigureActionPalette(vue_.graphe_.getModel()));
- r.add(new EbliActionSimple(EbliLib.getS("Configuration"), BuResource.BU.getToolIcon("configurer"), "CONFIGURE"){
- public void actionPerformed(ActionEvent _e) {
- EGPaletteLegendeGraphe palette =new EGPaletteLegendeGraphe(getGraphe());
- palette.setPreferredSize(new Dimension(500,600));
- palette.afficheModale(EGFillePanel.this.getParent());
-
- }
-
+ r.add(new EbliActionSimple(EbliLib.getS("Configuration"), BuResource.BU.getToolIcon("configurer"), "CONFIGURE") {
+ public void actionPerformed(ActionEvent _e) {
+ EGPaletteLegendeGraphe palette = new EGPaletteLegendeGraphe(getGraphe());
+ palette.setPreferredSize(new Dimension(500, 600));
+ palette.afficheModale(CtuluLibSwing.getFrameAncestor(EGFillePanel.this));
+
+ }
+
});
-
+
final BPaletteInfoAbstractAction info = new BPaletteInfoAbstractAction() {
public JComponent buildContentPane() {
@@ -232,7 +237,7 @@
}
// en dernier
- if (getModel().canAddCourbe()){
+ if (getModel().canAddCourbe()) {
r.add(null);
final EbliActionSimple addAction = new EbliActionSimple(EbliLib.getS("Ajouter une courbe"), BuResource.BU
.getToolIcon("creer"), "NEW_CURVE") {
@@ -387,8 +392,8 @@
public Dimension getDefaultImageDimension() {
return vue_.getDefaultImageDimension();
}
-
- public EGVue getView(){
+
+ public EGVue getView() {
return vue_;
}
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGraphe.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGraphe.java 2010-10-18 21:36:11 UTC (rev 5985)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGraphe.java 2010-10-18 21:36:39 UTC (rev 5986)
@@ -213,7 +213,7 @@
}
protected void setZoomAdaptedFor(final EGObject _g) {
- if(_g==null) return;
+ if (_g == null) return;
CtuluRange x = _g.getXRange();
final EGAxeHorizontal h = transformer_.getXAxe();
h.setBounds(x.min_, x.max_);
@@ -283,7 +283,8 @@
final Set axeSet = new HashSet();
EGAxeVertical last = null;
EGAxeVertical lastRight = null;
- for (int i = model.getNbEGObject() - 1; i >= 0; i--) {
+ int nbEGObject = model.getNbEGObject();
+ for (int i = 0; i < nbEGObject; i++) {
final EGObject o = model.getEGObject(i);
if ((getObject(i).isVisible()) && (o.isSomethingToDisplay())) {
final EGAxeVertical axe = getObject(i).getAxeY();
@@ -293,11 +294,11 @@
if (axe.isDroite()) {
m.ajouteMargesDroite(axe.getWidthNeeded(_gr));
// on recupere le dernier pour enlever la partie qui sera dessin\xE9 dans le graphe
- /* if (lastRight == null) */lastRight = axe;
+ if (lastRight == null) lastRight = axe;
} else {
m.ajouteMargesGauche(axe.getWidthNeeded(_gr));
// meme combat
- /* if (last == null) */last = axe;
+ if (last == null) last = axe;
}
temp = o.getMargeHautNeeded(_gr);
if (temp > m.getHaut()) {
@@ -880,16 +881,16 @@
}
/**
- * @return the merge axis-> the objects using the merges axis.
+ * @return the merge axis-> the objects using the merges axis.
*/
public Map<EGAxeVertical, List<EGObject>> getMergeAxis() {
Map<EGAxeVertical, List<EGObject>> res = new HashMap<EGAxeVertical, List<EGObject>>();
int nbEgObjects = getModel().getNbEGObject();
for (int i = 0; i < nbEgObjects; i++) {
EGObject egObject = getModel().getEGObject(i);
- //l'objet utilise un axe merge
+ // l'objet utilise un axe merge
if (isVerticalAxisMerged(egObject)) {
- //si oui, on enregistre l'axe
+ // si oui, on enregistre l'axe
EGAxeVertical mergeAxis = egObject.getAxeY();
List<EGObject> objects = res.get(mergeAxis);
if (objects == null) {
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGPaletteLegendeGraphe.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGPaletteLegendeGraphe.java 2010-10-18 21:36:11 UTC (rev 5985)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGPaletteLegendeGraphe.java 2010-10-18 21:36:39 UTC (rev 5986)
@@ -308,8 +308,6 @@
updatePanelData();
// paletteConf_.setPreferredSize(new Dimension(300,300));
paletteComp.setBorder(BorderFactory.createTitledBorder(EbliResource.EBLI.getString("Param\xE9trage")));
- // JScrollPane peast = new JScrollPane(paletteConf_);
- // peast.setPreferredSize(new Dimension(150, 200));
add(paletteComp, BorderLayout.CENTER);
if (selection.size() > 0) {
@@ -327,9 +325,7 @@
final BuPanel btpn = new BuPanel();
btpn.setLayout(new BuButtonLayout(1, SwingConstants.RIGHT));
- // btpn.add(btFormat_);
btpn.add(btRefresh_);
- // btpn.add(btApply_);
add(btpn, BuBorderLayout.SOUTH);
this.setPreferredSize(new Dimension(300, 300));
@@ -337,7 +333,6 @@
this.setBorder(BorderFactory.createTitledBorder(EbliResource.EBLI.getString("Edition de la l\xE9gende des courbes")));
// -- initialise au premier courbe --//
-// list_.setSelectedIndex(0);
}
private EGCourbe[] getSelectedCourbes() {
Modified: trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/controle/BConfigurePaletteAction.java
===================================================================
--- trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/controle/BConfigurePaletteAction.java 2010-10-18 21:36:11 UTC (rev 5985)
+++ trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/controle/BConfigurePaletteAction.java 2010-10-18 21:36:39 UTC (rev 5986)
@@ -67,8 +67,6 @@
doAfterDisplay();
return true;
- // return ((BConfigurePalette)palette_).setPalettePanelTarget(_target == null ? null : ((BCalque)
- // _target).getConfigureComponent());
}
public BPalettePanelInterface buildPaletteContent() {
Modified: trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/controle/BConfigureSectionBuilder.java
===================================================================
--- trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/controle/BConfigureSectionBuilder.java 2010-10-18 21:36:11 UTC (rev 5985)
+++ trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/controle/BConfigureSectionBuilder.java 2010-10-18 21:36:39 UTC (rev 5986)
@@ -1,8 +1,12 @@
/*
* @creation 10 nov. 06
+ *
* @modification $Date: 2007-05-04 13:49:45 $
+ *
* @license GNU General Public License 2
+ *
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ *
* @mail de...@fu...
*/
package org.fudaa.ebli.controle;
@@ -23,6 +27,7 @@
import javax.swing.JButton;
import javax.swing.JComponent;
import javax.swing.JLabel;
+import javax.swing.JScrollPane;
import javax.swing.SwingUtilities;
import javax.swing.UIManager;
@@ -46,49 +51,31 @@
final BConfigurableInterface sect_;
public static boolean isSame(final BConfigurableInterface _i1, final BConfigurableInterface _i2) {
- if (!isSameTitle(_i1, _i2)) {
- return false;
- };
- if (!isSame(_i1.createSelecteurs(), _i2.createSelecteurs())) {
- return false;
- }
+ if (!isSameTitle(_i1, _i2)) { return false; };
+ if (!isSame(_i1.createSelecteurs(), _i2.createSelecteurs())) { return false; }
final BConfigurableInterface[] c1 = _i1.getSections();
final BConfigurableInterface[] c2 = _i2.getSections();
- if (!CtuluLibArray.isSameSize(c1, c2)) {
- return false;
- }
+ if (!CtuluLibArray.isSameSize(c1, c2)) { return false; }
if (c1 != null) {
for (int i = c1.length - 1; i >= 0; i--) {
- if (!isSame(c1[i], c2[i])) {
- return false;
- }
+ if (!isSame(c1[i], c2[i])) { return false; }
}
}
return true;
}
private static boolean isSameTitle(final BConfigurableInterface _i1, final BConfigurableInterface _i2) {
- if (_i1 == _i2) {
- return true;
- }
- if (_i1 == null || _i2 == null) {
- return false;
- }
+ if (_i1 == _i2) { return true; }
+ if (_i1 == null || _i2 == null) { return false; }
return CtuluLib.isEquals(_i1.getTitle(), _i2.getTitle());
}
private static boolean isSameTitle(final List _list) {
- if (CtuluLibArray.isEmpty(_list)) {
- return false;
- }
- if (_list.size() == 1) {
- return true;
- }
+ if (CtuluLibArray.isEmpty(_list)) { return false; }
+ if (_list.size() == 1) { return true; }
final BConfigurableInterface i1 = (BConfigurableInterface) _list.get(0);
for (int i = _list.size() - 1; i > 0; i--) {
- if (!isSameTitle(i1, (BConfigurableInterface) _list.get(i))) {
- return false;
- }
+ if (!isSameTitle(i1, (BConfigurableInterface) _list.get(i))) { return false; }
}
return true;
}
@@ -98,43 +85,29 @@
}
private static boolean isSame(final List _list) {
- if (CtuluLibArray.isEmpty(_list)) {
- return false;
- }
- if (_list.size() == 1) {
- return true;
- }
+ if (CtuluLibArray.isEmpty(_list)) { return false; }
+ if (_list.size() == 1) { return true; }
final BConfigurableInterface i1 = (BConfigurableInterface) _list.get(0);
for (int i = _list.size() - 1; i > 0; i--) {
- if (!isSame(i1, (BConfigurableInterface) _list.get(i))) {
- return false;
- }
+ if (!isSame(i1, (BConfigurableInterface) _list.get(i))) { return false; }
}
return true;
}
public static BConfigurableInterface getCommonConfigurable(final BConfigurableInterface[] _conf) {
// on se d\xE9barrasse des cas tordus
- if (_conf == null || _conf.length == 0) {
- return null;
- }
- if (_conf.length == 1) {
- return _conf[0];
- }
+ if (_conf == null || _conf.length == 0) { return null; }
+ if (_conf.length == 1) { return _conf[0]; }
final BConfigurableInterface first = _conf[0];
boolean reallySame = true;
for (int i = 1; i < _conf.length && reallySame; i++) {
reallySame = isSame(first, _conf[i]);
}
- if (reallySame) {
- return new BConfigurableCommon(_conf);
- }
+ if (reallySame) { return new BConfigurableCommon(_conf); }
final List res = new ArrayList();
final BConfigurableInterface[][] sameTitle = getCommonSousSections(_conf, true);
- if (sameTitle == null) {
- return null;
- }
+ if (sameTitle == null) { return null; }
for (int i = 0; i < sameTitle.length; i++) {
if (CtuluLibArray.isEmpty(sameTitle[i])) {
continue;
@@ -157,18 +130,15 @@
.toArray(new BConfigurableInterface[res.size()]), null);
}
- private static BConfigurableInterface[][] getCommonSousSections(final BConfigurableInterface[] _conf, final boolean _testTitleOnly) {
+ private static BConfigurableInterface[][] getCommonSousSections(final BConfigurableInterface[] _conf,
+ final boolean _testTitleOnly) {
final BConfigurableInterface[] ssFirst = _conf[0].getSections();
- if (CtuluLibArray.isEmpty(ssFirst)) {
- return new BConfigurableInterface[0][0];
- }
+ if (CtuluLibArray.isEmpty(ssFirst)) { return new BConfigurableInterface[0][0]; }
int min = ssFirst.length;
final List[] sections = new ArrayList[min];
for (int i = 0; i < _conf.length; i++) {
final BConfigurableInterface[] ssi = _conf[i].getSections();
- if (CtuluLibArray.isEmpty(ssi)) {
- return null;
- }
+ if (CtuluLibArray.isEmpty(ssi)) { return null; }
min = Math.min(min, ssi.length);
for (int k = 0; k < min; k++) {
if (sections[k] == null) {
@@ -195,14 +165,10 @@
}
public static boolean isSame(final BSelecteurInterface[] _i1, final BSelecteurInterface[] _i2) {
- if (!CtuluLibArray.isSameSize(_i1, _i2)) {
- return false;
- }
+ if (!CtuluLibArray.isSameSize(_i1, _i2)) { return false; }
if (_i1 != null) {
for (int i = _i1.length - 1; i >= 0; i--) {
- if (!isSame(_i1[i], _i2[i])) {
- return false;
- }
+ if (!isSame(_i1[i], _i2[i])) { return false; }
}
}
return true;
@@ -367,24 +333,22 @@
for (int i = 0; i < ssSections_.length; i++) {
ssSectionsBuilder_[i] = new BConfigureSectionBuilder(ssSections_[i]);
ssSectionsBuilder_[i].buildPanel(true);
- tabbed.addTab(ssSections_[i].getTitle(), ssSectionsBuilder_[i].pn_);
+ tabbed.addTab(ssSections_[i].getTitle(), new JScrollPane(ssSectionsBuilder_[i].pn_,JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED));
}
}
}
-
+
protected void buildTab(int i) {
- buildTab();
- if(i>=0)
- selectTab(i);
+ buildTab();
+ if (i >= 0) selectTab(i);
}
- public void selectTab(int i){
- if(pn_==null || !(pn_ instanceof BuTabbedPane))
- return;
- ((BuTabbedPane)pn_).setSelectedIndex(i);
+ public void selectTab(int i) {
+ if (pn_ == null || !(pn_ instanceof BuTabbedPane)) return;
+ ((BuTabbedPane) pn_).setSelectedIndex(i);
}
-
+
protected void updateTarget() {
if (!CtuluLibArray.isEmpty(sel_)) {
for (int i = 0; i < sel_.length; i++) {
@@ -402,9 +366,7 @@
public void buildSelecteurs(final JComponent _pn, final GridBagConstraints _cl, final GridBagLayout _lay) {
components_ = new ArrayList();
- if (CtuluLibArray.isEmpty(sel_)) {
- return;
- }
+ if (CtuluLibArray.isEmpty(sel_)) { return; }
updateConstraints(_cl);
for (int i = 0; i < sel_.length; i++) {
final BSelecteurInterface si = sel_[i];
Modified: trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java
===================================================================
--- trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java 2010-10-18 21:36:11 UTC (rev 5985)
+++ trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java 2010-10-18 21:36:39 UTC (rev 5986)
@@ -45,6 +45,7 @@
import javax.swing.plaf.basic.BasicInternalFrameUI;
import org.fudaa.ctulu.*;
+import org.fudaa.ctulu.gui.CtuluAnalyzeGUI;
import org.fudaa.ctulu.gui.CtuluFileChooserFileTester;
import org.fudaa.ctulu.gui.CtuluFilleWithComponent;
import org.fudaa.ctulu.gui.CtuluLibDialog;
@@ -997,19 +998,9 @@
if (_analyze == null) { return false; }
if (!_analyze.isEmpty()) {
_analyze.printResume();
+ CtuluAnalyzeGUI.showDialogErrorFiltre(_analyze, this, _analyze.getDesc(), false);
}
- if (_analyze.getFatalError() != null) {
- final String f = _analyze.getFatalError();
- String deb = f;
- if (_analyze.containsErrors()) {
- deb += CtuluLibString.LINE_SEP + _analyze.getErrorResume();
- }
- error(_analyze.getDesc(), deb, false);
- return true;
- } else if (_analyze.containsErrors()) {
- error(_analyze.getDesc(), _analyze.getErrorResume());
- }
- return false;
+ return _analyze.getFatalError() != null;
}
public boolean manageErrorOperationAndIsFatal(final CtuluIOOperationSynthese _opResult) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
