Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[4300] branches/Prepro-0.92-SNAPSHOT
|
From: <de...@us...> - 2008-12-14 20:44:10
|
Revision: 4300
http://fudaa.svn.sourceforge.net/fudaa/?rev=4300&view=rev
Author: deniger
Date: 2008-12-14 20:44:06 +0000 (Sun, 14 Dec 2008)
Log Message:
-----------
maquetee v7
Modified Paths:
--------------
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/CtuluLibString.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGCourbe.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGCourbeConfigureTarget.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliScene.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/EbliWidgetGraphe.java
Modified: branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/CtuluLibString.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/CtuluLibString.java 2008-12-12 18:12:39 UTC (rev 4299)
+++ branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/CtuluLibString.java 2008-12-14 20:44:06 UTC (rev 4300)
@@ -55,9 +55,7 @@
public final static String EMPTY_STRING = "";
public static boolean containsVirgule(final String _num) {
- if (isEmpty(_num)) {
- return false;
- }
+ if (isEmpty(_num)) { return false; }
final String s = _num.trim();
try {
Double.parseDouble(s);
@@ -76,15 +74,11 @@
* @return true si la chaine est vide ou null ou si elle ne contient que des espaces
*/
public static boolean isEmpty(final String _s) {
- if (_s == null || _s == EMPTY_STRING) {
- return true;
- }
+ if (_s == null || _s == EMPTY_STRING) { return true; }
final int nb = _s.length();
for (int i = nb - 1; i >= 0; i--) {
- if (!Character.isWhitespace(_s.charAt(i))) {
- return false;
- }
+ if (!Character.isWhitespace(_s.charAt(i))) { return false; }
}
return true;
@@ -105,17 +99,13 @@
* @return true si c'est un nombre
*/
public static boolean isNumeric(final String _s) {
- if (isEmpty(_s)) {
- return false;
- }
+ if (isEmpty(_s)) { return false; }
final String s = _s.trim();
try {
Double.parseDouble(s);
return true;
} catch (final NumberFormatException e) {
- if (s.indexOf(',') > 0) {
- return isNumeric(FuLib.replace(s, CtuluLibString.VIR, CtuluLibString.DOT));
- }
+ if (s.indexOf(',') > 0) { return isNumeric(FuLib.replace(s, CtuluLibString.VIR, CtuluLibString.DOT)); }
return false;
}
}
@@ -208,9 +198,7 @@
public static String adjustSize(final int _taille, final String _s, boolean _addSpaceBefore) {
final String s = _s == null ? EMPTY_STRING : _s;
final int l = s.length();
- if (l > _taille) {
- return s.substring(0, _taille);
- }
+ if (l > _taille) { return s.substring(0, _taille); }
final StringBuffer r = new StringBuffer(_taille);
if (!_addSpaceBefore) {
r.append(s);
@@ -260,9 +248,7 @@
public static String adjustSize(final int _taille, final String _s, boolean _addSpaceBefore, final char _charToUse) {
final String s = _s == null ? EMPTY_STRING : _s;
final int l = s.length();
- if (l > _taille) {
- return s.substring(0, _taille);
- }
+ if (l > _taille) { return s.substring(0, _taille); }
final StringBuffer r = new StringBuffer(_taille);
if (!_addSpaceBefore) {
r.append(s);
@@ -327,12 +313,8 @@
}
public static String arrayToString(final double[] _o, final String _sep) {
- if (_o == null) {
- return getNullString();
- }
- if (_o.length == 0) {
- return getEmptyTableau();
- }
+ if (_o == null) { return getNullString(); }
+ if (_o.length == 0) { return getEmptyTableau(); }
final StringBuffer r = new StringBuffer();
r.append(_o[0]);
for (int i = 1; i < _o.length; i++) {
@@ -346,12 +328,8 @@
* @return une chaine contenant tous les entiers separees par des virgules
*/
public static String arrayToString(final long[] _o) {
- if (_o == null) {
- return getNullString();
- }
- if (_o.length == 0) {
- return getEmptyTableau();
- }
+ if (_o == null) { return getNullString(); }
+ if (_o.length == 0) { return getEmptyTableau(); }
final StringBuffer r = new StringBuffer();
r.append(_o[0]);
for (int i = 1; i < _o.length; i++) {
@@ -361,12 +339,8 @@
}
public static String arrayToString(final float[] _o) {
- if (_o == null) {
- return getNullString();
- }
- if (_o.length == 0) {
- return getEmptyTableau();
- }
+ if (_o == null) { return getNullString(); }
+ if (_o.length == 0) { return getEmptyTableau(); }
final StringBuffer r = new StringBuffer();
r.append(_o[0]);
for (int i = 1; i < _o.length; i++) {
@@ -380,12 +354,8 @@
* @return une chaine contenant tous les entiers separees par des virgules
*/
public static String arrayToString(final int[] _array) {
- if (_array == null) {
- return getNullString();
- }
- if (_array.length == 0) {
- return getEmptyTableau();
- }
+ if (_array == null) { return getNullString(); }
+ if (_array.length == 0) { return getEmptyTableau(); }
final StringBuffer r = new StringBuffer();
r.append(_array[0]);
for (int i = 1; i < _array.length; i++) {
@@ -400,12 +370,8 @@
* virgules.
*/
public static String arrayToString(final Object[] _o) {
- if (_o == null) {
- return getNullString();
- }
- if (_o.length == 0) {
- return getEmptyTableau();
- }
+ if (_o == null) { return getNullString(); }
+ if (_o.length == 0) { return getEmptyTableau(); }
final StringBuffer r = new StringBuffer();
r.append(_o[0].toString());
for (int i = 1; i < _o.length; i++) {
@@ -415,9 +381,7 @@
}
public static String arrayToHtmlString(final Object[] _o) {
- if ((_o == null) || (_o.length == 1)) {
- return EMPTY_STRING;
- }
+ if ((_o == null) || (_o.length == 1)) { return EMPTY_STRING; }
final StringBuffer r = new StringBuffer("<html><body>");
r.append(_o[0].toString());
for (int i = 1; i < _o.length; i++) {
@@ -443,9 +407,7 @@
* @return la chaine
*/
public static String arrayToString(final String[] _tab, final String _sep) {
- if (_tab == null) {
- return CtuluLibString.EMPTY_STRING;
- }
+ if (_tab == null) { return CtuluLibString.EMPTY_STRING; }
final int n = _tab.length;
if (n > 0) {
final StringBuffer obj = new StringBuffer();
@@ -466,9 +428,7 @@
* @return la chaine avec la premier lettre en majuscule.
*/
public static String capitalyze(final String _s) {
- if (isEmpty(_s)) {
- return _s;
- }
+ if (isEmpty(_s)) { return _s; }
final String prem = _s.substring(0, 1);
return prem.toUpperCase() + _s.substring(1);
}
@@ -478,9 +438,7 @@
* @return le tableau de string correspondant. Renvoie null si la taille est null ou si _v null.
*/
public static String[] enTableau(final Collection _v) {
- if ((_v == null) || (_v.size() == 0)) {
- return null;
- }
+ if ((_v == null) || (_v.size() == 0)) { return null; }
final String[] r = new String[_v.size()];
_v.toArray(r);
return r;
@@ -497,9 +455,7 @@
public static String findPrefixInTab(final String[] _tabToTest, final String _prefixe) {
for (int i = _tabToTest.length - 1; i >= 0; i--) {
final String s = _tabToTest[i];
- if (_prefixe.startsWith(s)) {
- return s;
- }
+ if (_prefixe.startsWith(s)) { return s; }
}
return null;
}
@@ -515,9 +471,7 @@
if (_tab != null) {
for (int i = _tab.length - 1; i >= 0; i--) {
final String s = _tab[i];
- if (s.endsWith(_end)) {
- return s;
- }
+ if (s.endsWith(_end)) { return s; }
}
}
return null;
@@ -533,9 +487,7 @@
public static String findStringIn(final String[] _stringToLookFor, final String _sToTest) {
for (int i = _stringToLookFor.length - 1; i >= 0; i--) {
final String s = _stringToLookFor[i];
- if (_sToTest.indexOf(s) >= 0) {
- return s;
- }
+ if (_sToTest.indexOf(s) >= 0) { return s; }
}
return null;
}
@@ -548,9 +500,7 @@
public static String findStringStartsWith(final String[] _tab, final String _start) {
for (int i = _tab.length - 1; i >= 0; i--) {
final String s = _tab[i];
- if (s.startsWith(_start)) {
- return s;
- }
+ if (s.startsWith(_start)) { return s; }
}
return null;
}
@@ -586,9 +536,7 @@
* @return descriprion
*/
public static String getObjectInString(final Object _o, final boolean _verbose) {
- if (_o == null) {
- return "null";
- }
+ if (_o == null) { return "null"; }
final StringBuffer b = new StringBuffer();
if (_o.getClass().isArray()) {
final int n = Array.getLength(_o);
@@ -661,9 +609,7 @@
* @return table cle,valeur ( voir doc)
*/
public static synchronized Map parseArgs(final String[] _args) {
- if (_args == null) {
- return null;
- }
+ if (_args == null) { return null; }
final int l = _args.length;
final Map r = new HashMap(l);
int index;
@@ -689,21 +635,17 @@
* @return le tableau des champs ou null si un des 2 parametres est nul.
*/
public static String[] parseString(final String _s, final String _sepChar) {
- if ((_s == null) || (_sepChar == null)) {
- return null;
- }
+ if ((_s == null) || (_sepChar == null)) { return null; }
return enTableau(parseStringList(_s, _sepChar));
}
public static double[] parseStringDouble(final String _s, final String _sepChar) {
- if ((_s == null) || (_sepChar == null)) {
- return null;
- }
+ if ((_s == null) || (_sepChar == null)) { return null; }
final List l = (parseStringList(_s, _sepChar));
final TDoubleArrayList res = new TDoubleArrayList();
for (int i = 0; i < l.size(); i++) {
try {
- res.add(Double.parseDouble((String) l.get(i)));
+ res.add(CtuluDoubleParser.parseValue((String) l.get(i)));
} catch (final NumberFormatException _evt) {
FuLog.error(_evt);
@@ -721,9 +663,7 @@
* @return le tableau des champs ou null si un des 2 parametres est nul.
*/
public static List parseStringList(final String _s, final String _sepChar) {
- if ((_s == null) || (_sepChar == null)) {
- return null;
- }
+ if ((_s == null) || (_sepChar == null)) { return null; }
final StringTokenizer tk = new StringTokenizer(_s, _sepChar);
final List l = new ArrayList();
while (tk.hasMoreTokens()) {
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGCourbe.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGCourbe.java 2008-12-12 18:12:39 UTC (rev 4299)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGCourbe.java 2008-12-14 20:44:06 UTC (rev 4300)
@@ -138,31 +138,32 @@
if (isMarkMaxLine() || isMarkMinLine()) {
r = EGCourbeModelDefault.getLocalMinMax(_t.getXAxe(), getModel());
}
- if (r != null && isMarkMinLine() && getAxeY().containsPoint(r.min_)) {
+ EGAxeVertical axeY = getAxeY();
+ if (r != null && isMarkMinLine() && axeY.containsPoint(r.min_)) {
trMarqueur = getLineMarkeur();
- final int yie = _t.getYEcran(r.min_, getAxeY());
+ final int yie = _t.getYEcran(r.min_, axeY);
trMarqueur.dessineTrait(_g, xmin, yie, xmax, yie);
initTraceBox();
tbox_.setColorBoite(tLigneMarqueur_.getCouleur());
int x = xmin + 3;
- final String str = getAxeY().getStringAffiche(r.min_);
- if (getAxeY().isDroite()) {
+ final String str = axeY.getStringAffiche(r.min_);
+ if (axeY.isDroite()) {
x = xmax - 6 - _g.getFontMetrics().stringWidth(str);
}
tbox_.paintBox(_g, x, yie, str);
}
- if (r != null && isMarkMaxLine() && getAxeY().containsPoint(r.max_)) {
+ if (r != null && isMarkMaxLine() && axeY.containsPoint(r.max_)) {
if (trMarqueur == null) {
trMarqueur = getLineMarkeur();
}
- final int yie = _t.getYEcran(r.max_, getAxeY());
+ final int yie = _t.getYEcran(r.max_, axeY);
trMarqueur.dessineTrait(_g, xmin, yie, xmax, yie);
initTraceBox();
tbox_.setColorBoite(tLigneMarqueur_.getCouleur());
int x = xmin + 3;
- final String str = getAxeY().getStringAffiche(r.max_);
- if (getAxeY().isDroite()) {
+ final String str = axeY.getStringAffiche(r.max_);
+ if (axeY.isDroite()) {
x = xmax - 6 - _g.getFontMetrics().stringWidth(str);
}
tbox_.paintBox(_g, x, yie, str);
@@ -174,11 +175,11 @@
initTraceBox();
tbox_.setColorBoite(tLigneMarqueur_.getCouleur());
for (int i = 0; i < markH_.length; i++) {
- if (getAxeY().containsPoint(markH_[i])) {
- final int yie = _t.getYEcran(markH_[i], getAxeY());
+ if (axeY.containsPoint(markH_[i])) {
+ final int yie = _t.getYEcran(markH_[i], axeY);
int x = xmin + 3;
- final String str = getAxeY().getStringAffiche(markH_[i]);
- if (getAxeY().isDroite()) {
+ final String str = axeY.getStringAffiche(markH_[i]);
+ if (axeY.isDroite()) {
x = xmax - 6 - _g.getFontMetrics().stringWidth(str);
}
trMarqueur.dessineTrait(_g, xmin, yie, xmax, yie);
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGCourbeConfigureTarget.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGCourbeConfigureTarget.java 2008-12-12 18:12:39 UTC (rev 4299)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGCourbeConfigureTarget.java 2008-12-14 20:44:06 UTC (rev 4300)
@@ -126,7 +126,7 @@
final double[] marks = target_.getMarks();
String res = null;
- if (marks != null) {
+ if (marks != null&& marks.length>0) {
res = CtuluLibString.arrayToString(marks, ";");
}
return res == null ? CtuluLibString.EMPTY_STRING : res;
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliScene.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliScene.java 2008-12-12 18:12:39 UTC (rev 4299)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliScene.java 2008-12-14 20:44:06 UTC (rev 4300)
@@ -6,7 +6,9 @@
import java.awt.image.BufferedImage;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
+import java.util.Collections;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -16,11 +18,16 @@
import org.fudaa.ctulu.image.CtuluImageProducer;
import org.fudaa.ctulu.image.CtuluLibImage;
import org.fudaa.ebli.visuallibrary.tree.EbliWidgetJXTreeTableModel;
+import org.netbeans.api.visual.action.InplaceEditorProvider;
+import org.netbeans.api.visual.action.WidgetAction;
+import org.netbeans.api.visual.action.WidgetAction.Chain;
import org.netbeans.api.visual.graph.GraphScene;
import org.netbeans.api.visual.widget.LayerWidget;
import org.netbeans.api.visual.widget.Scene;
import org.netbeans.api.visual.widget.Widget;
+import sun.misc.Cleaner;
+
/**
* classe de gestion de la scene principale
*
@@ -30,7 +37,7 @@
EbliWidgetInterface<EbliSceneController> {
int idx_ = 0;
-
+
CtuluUI ctuluUi_;
/**
@@ -47,6 +54,31 @@
ctuluUi_ = _ctuluUi;
}
+ public void stopEditing() {
+ Set<?> objects2 = getSelectedObjects();
+ if (objects2 != null) {
+ for (Iterator iterator = objects2.iterator(); iterator.hasNext();) {
+ Object object = (Object) iterator.next();
+ stopEditing(findWidget(object));
+
+ }
+ }
+ }
+
+ protected void stopEditing(Widget w) {
+ if(w==null) return;
+ Chain actions = w.getActions();
+ for (WidgetAction widgetAction : actions.getActions()) {
+ if (widgetAction instanceof InplaceEditorProvider.EditorController
+ && ((InplaceEditorProvider.EditorController) widgetAction).isEditorVisible()) {
+ ((InplaceEditorProvider.EditorController) widgetAction).closeEditor(true);
+ }
+ }
+ for (Widget widget : w.getChildren()) {
+ stopEditing(widget);
+ }
+ }
+
protected String generateId() {
// return CtuluLibString.getString(idx_++);
return CtuluLibGenerator.getInstance().deliverUniqueStringId();
@@ -113,7 +145,6 @@
*/
private final EbliSceneController controller_;
-
public static void refreshScene(final Scene _sc) {
_sc.validate();
_sc.repaint();
@@ -320,66 +351,55 @@
return null;
}
-
-
+
/**
* Methode qui redimensionne proportionellement les widget \xE0 la scene
+ *
* @param size
*/
- public void resizeInnerWidget(Dimension newSize,Dimension oldSize){
- // this.getVisu().setPreferredSize(newSize);
- if(getNodes().size()==0)
- return;
- for (final Iterator<EbliNode> it2 = getNodes().iterator(); it2.hasNext();) {
+ public void resizeInnerWidget(Dimension newSize, Dimension oldSize) {
+ // this.getVisu().setPreferredSize(newSize);
+ if (getNodes().size() == 0) return;
+ for (final Iterator<EbliNode> it2 = getNodes().iterator(); it2.hasNext();) {
- final EbliNode currentNode = it2.next();
- if (currentNode != null && currentNode.hasWidget()) {
+ final EbliNode currentNode = it2.next();
+ if (currentNode != null && currentNode.hasWidget()) {
-
- Rectangle oldRectangle=currentNode.getWidget().getPreferredBounds();
+ Rectangle oldRectangle = currentNode.getWidget().getPreferredBounds();
- double proportionW=newSize.width*oldRectangle.width/oldSize.width;
- double proportionH=newSize.width*oldRectangle.height/oldSize.height;
-
-
- // -- retaillage --//
- currentNode.getWidget().setPreferredBounds(
- new Rectangle(new Dimension((int)proportionW, (int)proportionH)));
+ double proportionW = newSize.width * oldRectangle.width / oldSize.width;
+ double proportionH = newSize.width * oldRectangle.height / oldSize.height;
-
- // -- rafraichissement de la scene --//
- this.refresh();
+ // -- retaillage --//
+ currentNode.getWidget().setPreferredBounds(new Rectangle(new Dimension((int) proportionW, (int) proportionH)));
- }
- }
-
- // this.setPreferredSize(newSize);
-
-
+ // -- rafraichissement de la scene --//
+ this.refresh();
+
+ }
+ }
+
+ // this.setPreferredSize(newSize);
+
}
-
-
-
- public void moveWidgetTo(EbliWidget widget, int position){
-
- //-- ne marche pas.......................... --//
-
-
-//
-// if (widget.getParentWidget() == null)
-// return;
-// List<Widget> children = getChildren();
-// int i = children.indexOf (widget);
-// if (i < 0)
-// return;
-// children.remove (i);
-// children.add (position, widget);
-// widget.revalidate ();
-// widget.getParentWidget().revalidate ();
-// refresh();
-
-
+
+ public void moveWidgetTo(EbliWidget widget, int position) {
+
+ // -- ne marche pas.......................... --//
+
+ //
+ // if (widget.getParentWidget() == null)
+ // return;
+ // List<Widget> children = getChildren();
+ // int i = children.indexOf (widget);
+ // if (i < 0)
+ // return;
+ // children.remove (i);
+ // children.add (position, widget);
+ // widget.revalidate ();
+ // widget.getParentWidget().revalidate ();
+ // refresh();
+
}
-
-
+
}
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/EbliWidgetGraphe.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/EbliWidgetGraphe.java 2008-12-12 18:12:39 UTC (rev 4299)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/EbliWidgetGraphe.java 2008-12-14 20:44:06 UTC (rev 4300)
@@ -152,7 +152,7 @@
}
// mode edition
- if (imageGraphe == null || imageGraphe.getWidth() != rec.width || imageGraphe.getHeight() != rec.height) {
+ if (imageGraphe == null || imageGraphe.getWidth() != (rec.width-1) || imageGraphe.getHeight() != (rec.height-1)) {
FuLog.debug("EWI: recreate image");
final Map params = new HashMap();
CtuluLibImage.setCompatibleImageAsked(params);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
