Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[3831] branches/Prepro-0.92-SNAPSHOT
|
From: <de...@us...> - 2008-08-21 20:14:20
|
Revision: 3831
http://fudaa.svn.sourceforge.net/fudaa/?rev=3831&view=rev
Author: deniger
Date: 2008-08-21 20:14:24 +0000 (Thu, 21 Aug 2008)
Log Message:
-----------
maj prepro
Modified Paths:
--------------
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/gui/CtuluLibSwing.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/ZEbliCalquesPanel.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/EbliWidget.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetVueCalque.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliWidgetJXTreeTableModel.java
branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestGraphe2.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutPanelController.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostVisuPanel.java
branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/prepro/build.xml
branches/Prepro-0.92-SNAPSHOT/fudaaFormatage.xml
Added Paths:
-----------
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/DefaultObjectSceneListener.java
Removed Paths:
-------------
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNodeListener.java
Modified: branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/gui/CtuluLibSwing.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/gui/CtuluLibSwing.java 2008-08-21 15:27:05 UTC (rev 3830)
+++ branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/gui/CtuluLibSwing.java 2008-08-21 20:14:24 UTC (rev 3831)
@@ -63,11 +63,22 @@
}
/**
- * Ajouter un actionListener a la checkbox _res afin d'activer ou non un
- * panneau (et tous ces composants).
+ * @param _parent le composant \xE0 partir duquel la recherche commence
+ * @param _name le nom du composant fils \xE0 chercher
+ * @return le fils direct de _parent ayant le nom donne ou null si non trouve
+ */
+ public static JComponent findChildByName(JComponent _parent, String _name) {
+ if (_parent == null || _name == null) return null;
+ for (int i = _parent.getComponentCount() - 1; i >= 0; i--) {
+ if (_name.equals(_parent.getComponent(i).getName())) return (JComponent) _parent.getComponent(i);
+ }
+ return null;
+ }
+
+ /**
+ * Ajouter un actionListener a la checkbox _res afin d'activer ou non un panneau (et tous ces composants).
*
- * @param _target le panneau dont les composants seront activ\xE9es ou non, selon
- * l'\xE9tat de la checkbox _res
+ * @param _target le panneau dont les composants seront activ\xE9es ou non, selon l'\xE9tat de la checkbox _res
* @param _res la checkbox permettant de activer ou non un panneau
*/
public static void addActionListenerForCheckBoxTitle(final JPanel _target, final JCheckBox _res) {
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/ZEbliCalquesPanel.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/ZEbliCalquesPanel.java 2008-08-21 15:27:05 UTC (rev 3830)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/ZEbliCalquesPanel.java 2008-08-21 20:14:24 UTC (rev 3831)
@@ -41,6 +41,7 @@
import org.fudaa.ctulu.CtuluLibString;
import org.fudaa.ctulu.CtuluUI;
+import org.fudaa.ctulu.gui.CtuluLibSwing;
import org.fudaa.ctulu.gui.CtuluTreeComboboxModel;
import org.fudaa.ctulu.gui.CtuluTreeComboboxRenderer;
import org.fudaa.ctulu.image.CtuluImageProducer;
@@ -313,9 +314,9 @@
// le panel sud contenant le suivi de souris et le mode
mode_ = new BuLabel();
- mode_.setFont(BuLib.deriveFont("Label", Font.PLAIN, -2));
- mode_.setPreferredSize(new Dimension(120, 20));
- mode_.setSize(new Dimension(120, 20));
+ mode_.setFont(CtuluLibSwing.getMiniFont());
+ mode_.setPreferredSize(new Dimension(150, 20));
+ mode_.setSize(new Dimension(150, 20));
mode_.setVisible(false);
mode_.setOpaque(false);
info_ = new BuLabel();
@@ -331,6 +332,7 @@
add(vc_, BuBorderLayout.CENTER);
if (_addSouth) {
final BuPanel south = new BuPanel();
+ south.setName("pnSuivis");
south.setLayout(new BuBorderLayout());
south.setOpaque(false);
south.setBorder(BorderFactory.createMatteBorder(1, 0, 0, 0, Color.gray));
Added: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/DefaultObjectSceneListener.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/DefaultObjectSceneListener.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/DefaultObjectSceneListener.java 2008-08-21 20:14:24 UTC (rev 3831)
@@ -0,0 +1,36 @@
+/*
+ * Licence GPL
+ * Copyright Genesis
+ */
+package org.fudaa.ebli.visuallibrary;
+
+import java.util.Set;
+
+import org.netbeans.api.visual.model.ObjectSceneEvent;
+import org.netbeans.api.visual.model.ObjectSceneListener;
+import org.netbeans.api.visual.model.ObjectState;
+
+/**
+ * Classe implementant \xE0 vide les m\xE9thodes de ObjectSceneListener.
+ *
+ * @author deniger
+ */
+public class DefaultObjectSceneListener implements ObjectSceneListener {
+
+ public void focusChanged(ObjectSceneEvent _event, Object _previousFocusedObject, Object _newFocusedObject) {}
+
+ public void highlightingChanged(ObjectSceneEvent _event, Set<Object> _previousHighlighting,
+ Set<Object> _newHighlighting) {}
+
+ public void hoverChanged(ObjectSceneEvent _event, Object _previousHoveredObject, Object _newHoveredObject) {}
+
+ public void objectAdded(ObjectSceneEvent _event, Object _addedObject) {}
+
+ public void objectRemoved(ObjectSceneEvent _event, Object _removedObject) {}
+
+ public void objectStateChanged(ObjectSceneEvent _event, Object _changedObject, ObjectState _previousState,
+ ObjectState _newState) {}
+
+ public void selectionChanged(ObjectSceneEvent _event, Set<Object> _previousSelection, Set<Object> _newSelection) {}
+
+}
Deleted: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNodeListener.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNodeListener.java 2008-08-21 15:27:05 UTC (rev 3830)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNodeListener.java 2008-08-21 20:14:24 UTC (rev 3831)
@@ -1,11 +0,0 @@
-package org.fudaa.ebli.visuallibrary;
-
-public interface EbliNodeListener {
-
- void nodeAdded(EbliNode node);
-
- void nodeRemoved(EbliNode node);
-
-
-
-}
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-08-21 15:27:05 UTC (rev 3830)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliScene.java 2008-08-21 20:14:24 UTC (rev 3831)
@@ -3,9 +3,7 @@
import java.awt.Point;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
+import java.util.Collections;
import javax.swing.JMenuItem;
import javax.swing.JPopupMenu;
@@ -14,20 +12,42 @@
import org.fudaa.ebli.visuallibrary.actions.EbliWidgetEditCreator;
import org.netbeans.api.visual.action.ActionFactory;
import org.netbeans.api.visual.action.PopupMenuProvider;
+import org.netbeans.api.visual.action.SelectProvider;
import org.netbeans.api.visual.action.WidgetAction;
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 org.netbeans.modules.visual.action.SelectAction;
/**
* classe de gestion de la scene principale
*
* @author Adrien Hadoux
- *
*/
public class EbliScene extends GraphScene<EbliNode, EbliEdge> {
+ private class ObjectSelectProvider implements SelectProvider {
+
+ public boolean isAimingAllowed(Widget widget, Point localLocation, boolean invertSelection) {
+ return false;
+ }
+
+ public boolean isSelectionAllowed(Widget widget, Point localLocation, boolean invertSelection) {
+ return findObject(widget) != null;
+ }
+
+ public void select(Widget widget, Point localLocation, boolean invertSelection) {
+ Object object = findObject(widget);
+
+ setFocusedObject(object);
+ if (object != null) {
+ if (!invertSelection && getSelectedObjects().contains(object)) return;
+ userSelectionSuggested(Collections.singleton(object), invertSelection);
+ } else userSelectionSuggested(Collections.emptySet(), invertSelection);
+ }
+ }
+
public static void refreshScene(Scene _sc) {
_sc.validate();
_sc.repaint();
@@ -35,72 +55,50 @@
}
- EbliWidgetEditCreator editor_ = EbliWidgetEditCreator.INSTANCE;
+ final private WidgetAction alignWithMoveAction;
/**
- * @return the editor
- */
- public EbliWidgetEditCreator getEditor() {
- return editor_;
- }
-
- /**
- * @param _editor the editor to set
- */
- public void setEditor(EbliWidgetEditCreator _editor) {
- editor_ = _editor;
- }
-
- /**
* Le gestionnaire de commande associe \xE0 la scene
*/
CtuluCommandManager cmdMng_;
+ EbliWidgetEditCreator editor_ = EbliWidgetEditCreator.INSTANCE;
+
+ private LayerWidget interactionLayer_;
+
+ public final WidgetAction rectangularSelection_;
+
/**
* la visu du graphscene
*/
private LayerWidget visu_;
- private LayerWidget interactionLayer_;
-
- final private WidgetAction alignWithMoveAction;
-
/**
* la liste des listener associes a la scene
*/
- Collection<EbliNodeListener> listenerList;
-
+ // Collection<EbliNodeListener> listenerList;
public EbliScene() {
super();
setLookFeel(new EbliLookFeel());
// creation du layer de mise en page
+ interactionLayer_ = new LayerWidget(this);
+ addChild(interactionLayer_);
visu_ = new LayerWidget(this);
addChild(visu_);
- interactionLayer_ = new LayerWidget(this);
- addChild(interactionLayer_);
+
+
alignWithMoveAction = ActionFactory.createAlignWithMoveAction(visu_, interactionLayer_, ActionFactory
.createDefaultAlignWithMoveDecorator(), false);
-
+ rectangularSelection_=ActionFactory.createRectangularSelectAction(this, interactionLayer_);
// -- ajoute l'action du zoom ( ctrl + clic)
- getActions().addAction(ActionFactory.createZoomAction(1.1, true));
+ getActions().addAction(ActionFactory.createCenteredZoomAction(1.1));
+ getActions().addAction(rectangularSelection_);
// -- ajouter le menu popup de base
setMenuBase();
}
- /**
- * Methode qui permet d ajouter un listener
- *
- * @param listener
- */
- public void addEbliNodeListener(EbliNodeListener listener) {
- // init si necessaire
- if (listenerList == null) listenerList = new HashSet<EbliNodeListener>();
- // ajout
- listenerList.add(listener);
- }
-
@Override
protected void attachEdgeSourceAnchor(EbliEdge edge, EbliNode oldSourceNode, EbliNode sourceNode) {
@@ -116,6 +114,18 @@
return null;
}
+ // /**
+ // * Methode qui permet d ajouter un listener
+ // *
+ // * @param listener
+ // */
+ // public void addEbliNodeListener(EbliNodeListener listener) {
+ // // init si necessaire
+ // if (listenerList == null) listenerList = new HashSet<EbliNodeListener>();
+ // // ajout
+ // listenerList.add(listener);
+ // }
+
@Override
protected Widget attachNodeWidget(EbliNode node) {
@@ -133,29 +143,17 @@
}
/**
- * Called by the removeNode method to notify that a node is removed from the
- * graph model. The default implementation removes the node widget from its
- * parent widget.
- *
- * @param node the removed node
- * @param widget the removed node widget; null if the node is non-visual
- *
- * Surcharge pour faire appel au notify des listener et ainsi mettre
- * ajour les listener
+ * @return the cmdMng
*/
- protected void detachNodeWidget(EbliNode node, Widget widget) {
- // -- indique la suppresion du node chez le parent
- notifyAllListenerNodeRemoved(node);
-
- if (widget != null) widget.removeFromParent();
-
+ public CtuluCommandManager getCmdMng() {
+ return cmdMng_;
}
/**
- * @return the cmdMng
+ * @return the editor
*/
- public CtuluCommandManager getCmdMng() {
- return cmdMng_;
+ public EbliWidgetEditCreator getEditor() {
+ return editor_;
}
public LayerWidget getLayerVisu() {
@@ -166,63 +164,67 @@
return alignWithMoveAction;
}
- public LayerWidget getVisu() {
- return visu_;
- }
-
/**
- * Methode qui permet d envoyer le signal du node ajout\xE9 a tous les listener
- *
- * @param listener
+ * @return the rectangularSelection
*/
- public void notifyAllListenerNodeAdded(EbliNode node) {
- if (listenerList == null) return;
- for (Iterator<EbliNodeListener> it = listenerList.iterator(); it.hasNext();) {
- it.next().nodeAdded(node);
- }
+ public WidgetAction getRectangularSelection() {
+ return rectangularSelection_;
+ }
+ public LayerWidget getVisu() {
+ return visu_;
}
/**
- * Methode qui permet d envoyer le signal du node retir\xE9 a tous les listener
+ * Methode qui permet d envoyer le signal du node selectionn\xE9 a tous les listener
*
* @param listener
*/
- public void notifyAllListenerNodeRemoved(EbliNode node) {
- if (listenerList == null) return;
+ // public void notifyAllListenerNodeSelected(EbliNode node) {
+ // if (listenerList == null)
+ // return;
+ //
+ // for (Iterator<EbliNodeListener> it = listenerList.iterator(); it.hasNext();) {
+ // EbliNodeListener listener = it.next();
+ // listener.nodeRemoved(node);
+ // }
+ //
+ // }
- for (Iterator<EbliNodeListener> it = listenerList.iterator(); it.hasNext();) {
- EbliNodeListener listener = it.next();
- listener.nodeRemoved(node);
- }
-
- }
-
- /**
- * Methode qui permet d envoyer le signal du node selectionn\xE9 a tous les
- * listener
- *
- * @param listener
- */
- public void notifyAllListenerNodeSelected(EbliNode node) {
- if (listenerList == null)
- return;
-
- for (Iterator<EbliNodeListener> it = listenerList.iterator(); it.hasNext();) {
- EbliNodeListener listener = it.next();
- listener.nodeRemoved(node);
- }
-
- }
-
-
-
@Override
protected void notifyNodeAdded(EbliNode node, Widget widget) {
- // -- notifier tous les listener que le noeud a ete attache --//
- notifyAllListenerNodeAdded(node);
+ // -- notifier tous les listener que le noeud a ete attache --//
+ // notifyAllListenerNodeAdded(node);
}
+ // /**
+ // * Methode qui permet d envoyer le signal du node ajout\xE9 a tous les listener
+ // *
+ // * @param listener
+ // */
+ // public void notifyAllListenerNodeAdded(EbliNode node) {
+ // if (listenerList == null) return;
+ // for (Iterator<EbliNodeListener> it = listenerList.iterator(); it.hasNext();) {
+ // it.next().nodeAdded(node);
+ // }
+ //
+ // }
+ //
+ // /**
+ // * Methode qui permet d envoyer le signal du node retir\xE9 a tous les listener
+ // *
+ // * @param listener
+ // */
+ // public void notifyAllListenerNodeRemoved(EbliNode node) {
+ // if (listenerList == null) return;
+ //
+ // for (Iterator<EbliNodeListener> it = listenerList.iterator(); it.hasNext();) {
+ // EbliNodeListener listener = it.next();
+ // listener.nodeRemoved(node);
+ // }
+ //
+ // }
+
/**
* Methode qui permet de raffraichir les elements de la scene
*/
@@ -237,6 +239,13 @@
cmdMng_ = _cmdMng;
}
+ /**
+ * @param _editor the editor to set
+ */
+ public void setEditor(EbliWidgetEditCreator _editor) {
+ editor_ = _editor;
+ }
+
public void setMenuBase() {
getActions().addAction(ActionFactory.createPopupMenuAction(new PopupMenuProvider() {
public JPopupMenu getPopupMenu(Widget widget, Point localLocation) {
@@ -281,12 +290,5 @@
public void setVisu_(LayerWidget visu_) {
this.visu_ = visu_;
}
-
-
-
-
-
-
-
}
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidget.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidget.java 2008-08-21 15:27:05 UTC (rev 3830)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidget.java 2008-08-21 20:14:24 UTC (rev 3831)
@@ -32,16 +32,14 @@
* Widget version EBLI
*
* @author Adrien Hadoux
- *
*/
public class EbliWidget extends Widget implements BSelecteurTargetInterface {
private EbliScene scene_;
/**
- * Map contenant tous les objets graphiques de la widget generique. key:
- * lineModel => le lignemodel du ebliWidget. key: color => couleur de fond.
- *
+ * Map contenant tous les objets graphiques de la widget generique. key: lineModel => le lignemodel du ebliWidget.
+ * key: color => couleur de fond.
*/
public Map propGraphique;
@@ -64,9 +62,7 @@
public BConfigurableInterface[] getConfigureInterfaces() {
return new BConfigurableInterface[] { new BConfigurableComposite(getSingleConfigureInterface(), EbliLib
.getS("Affichage")) /*
- * , new
- * BConfigurableComposite(getSingleConfigureInterface
- * (), EbliLib.getS("Gizmo caca"))
+ * , new BConfigurableComposite(getSingleConfigureInterface (), EbliLib.getS("Gizmo caca"))
*/};
}
@@ -76,8 +72,7 @@
}
/**
- * Retourne une interface widgetConfigure qui permet de gerer les interfaces a
- * creer
+ * Retourne une interface widgetConfigure qui permet de gerer les interfaces a creer
*
* @return
*/
@@ -105,20 +100,17 @@
}
/**
- * Retourne l objet correspondant a la clef: retourne l objet graphique
- * correspondant depuis la map d objets graphiques de la widget.
+ * Retourne l objet correspondant a la clef: retourne l objet graphique correspondant depuis la map d objets
+ * graphiques de la widget.
*/
public Object getProperty(String _key) {
-
-
// -- cas particulier si il s agit de la rotation --//
// -- il faut transformer les degres en radian --//
if (_key.equals(ROTATION)) {
double radian = getRotation();
- int degre = (int) (radian * 180 / Math.PI);
- return new Integer(degre);
+ return Integer.valueOf((int) (radian * 180 / Math.PI));
}
@@ -128,13 +120,11 @@
public void removePropertyChangeListener(String _key, PropertyChangeListener _l) {}
/**
- * Methode directement appelee apres modification des parametres renvoye par
- * le getproperty. Ajoute les anciens parametres dans la commande undo/redo.
+ * Methode directement appelee apres modification des parametres renvoye par le getproperty. Ajoute les anciens
+ * parametres dans la commande undo/redo.
*/
public boolean setProperty(String _key, Object prop) {
-
-
// --cas particulier si il s agit du tracelignemodel: il faut mettre a jour
// l ancien lignemodel --//
if (_key.equals(LINEMODEL)) {
@@ -224,8 +214,6 @@
*/
public void constructPopupMenuBase(JPopupMenu _popup) {
-
-
JMenuItem menuItem3 = _popup.add("Masquer l'objet");
menuItem3.setIcon(CtuluResource.CTULU.getIcon("crystal22_visibilite"));
menuItem3.addActionListener(new ActionListener() {
@@ -289,8 +277,7 @@
}
/**
- * methode qui construit une widget duplication pqr default, doit etre
- * surchargee pour reproduire l' evenement
+ * methode qui construit une widget duplication pqr default, doit etre surchargee pour reproduire l' evenement
*
* @return
*/
@@ -315,9 +302,8 @@
}
/**
- * Methode generique qui fait apparaitre un menuItem propre au composant et
- * offre les op\xE9rations de base on ouvre le menu via le clic droit ou le
- * raccourcis shift+F10
+ * Methode generique qui fait apparaitre un menuItem propre au composant et offre les op\xE9rations de base on ouvre le
+ * menu via le clic droit ou le raccourcis shift+F10
*/
public void setMenu() {
@@ -336,8 +322,7 @@
}
/**
- * Attention ce menu ne doit pas apparaitre pour les calques et graphe car il
- * n a aucun effet.
+ * Attention ce menu ne doit pas apparaitre pour les calques et graphe car il n a aucun effet.
*
* @param _popup
*/
@@ -369,10 +354,9 @@
});
}
-
-
- public void setScene_(EbliScene scene_) {
- this.scene_ = scene_;
+
+ public void setScene_(EbliScene _scene) {
+ this.scene_ = _scene;
}
public void setUseBorder(boolean _useBorder) {
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetVueCalque.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetVueCalque.java 2008-08-21 15:27:05 UTC (rev 3830)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetVueCalque.java 2008-08-21 20:14:24 UTC (rev 3831)
@@ -16,6 +16,7 @@
import java.util.HashMap;
import java.util.Map;
+import javax.swing.BorderFactory;
import javax.swing.JComponent;
import javax.swing.JMenuItem;
import javax.swing.JPopupMenu;
@@ -36,19 +37,16 @@
import org.netbeans.api.visual.action.WidgetAction;
import org.netbeans.api.visual.widget.Widget;
+import com.memoire.bu.BuBorders;
import com.memoire.bu.BuButton;
import com.memoire.bu.BuPanel;
import com.memoire.bu.BuResource;
import com.memoire.fu.FuLog;
-
-
/**
- *
* Classe permettant d'afficher un calque en tant que Widget
*
* @author deniger
- *
*/
public class EbliWidgetVueCalque extends EbliWidget implements
/* EditProvider */InplaceEditorProvider<BuPanel> {
@@ -65,12 +63,13 @@
BufferedImage image;
BuPanel conteneurEditor;
-
- GrBoite zoom_;
+ // GrBoite zoom_;
+
public EbliWidgetVueCalque(EbliScene scene, ZEbliCalquesPanel vue) {
super(scene);
calquePanel_ = vue;
+ calquePanel_.setBorder(BuBorders.EMPTY1111);
// FIXME a enlever par la suite
setPreferredSize(new Dimension(500, 400));
@@ -86,32 +85,29 @@
WidgetAction editorAction = new EbliActionEditorOneClick<BuPanel>(this);
// -- ajout de l action au widget correspondant --//
this.getActions().addAction(editorAction);
-
-
-
}
public BuPanel createEditorComponent(
org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller, Widget widget) {
- conteneurEditor = new BuPanel(new BorderLayout());
+ // conteneurEditor = new BuPanel(new BorderLayout());
+ //
+ // conteneurEditor.add(calquePanel_, BorderLayout.CENTER);
+ //
+ // BuButton fonctionsCompletes = new BuButton("Ouvrir dans une fen\xEAtre", BuResource.BU.getIcon("crystal_valider"));
+ // fonctionsCompletes.addActionListener(new ActionListener() {
+ //
+ // public void actionPerformed(ActionEvent e) {
+ // // Cree la frame de docking associee au calque
+ // edit(EbliWidgetVueCalque.this);
+ //
+ // }
+ //
+ // });
+ // conteneurEditor.add(fonctionsCompletes, BorderLayout.SOUTH);
- conteneurEditor.add(calquePanel_, BorderLayout.CENTER);
-
- BuButton fonctionsCompletes = new BuButton("Ouvrir dans une fen\xEAtre", BuResource.BU.getIcon("crystal_valider"));
- fonctionsCompletes.addActionListener(new ActionListener() {
-
- public void actionPerformed(ActionEvent e) {
- // Cree la frame de docking associee au calque
- edit(EbliWidgetVueCalque.this);
-
- }
-
- });
- conteneurEditor.add(fonctionsCompletes, BorderLayout.SOUTH);
-
- return conteneurEditor;
+ return calquePanel_;
}
/**
@@ -119,22 +115,22 @@
*/
public void notifyClosing(org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller,
Widget widget, BuPanel editor, boolean commit) {
-
- zoom_ = calquePanel_.getVueCalque().getViewBoite();
+
+ // zoom_ = calquePanel_.getVueCalque().getViewBoite();
image = null;
+
getEbliScene().refresh();
+ calquePanel_.setBorder(BuBorders.EMPTY1111);
this.repaint();
}
/**
- * Creer une frame qui contient toutes les fonctions pour modifier le calque.
- * Ancienne methode edit().
+ * Creer une frame qui contient toutes les fonctions pour modifier le calque. Ancienne methode edit().
*
* @param _widget
*/
public void edit(Widget _widget) {
- if (frame_ != null)
- frame_.toFront();
+ if (frame_ != null) frame_.toFront();
else {
final GrBoite gr = calquePanel_.getVueCalque().getViewBoite();
Rectangle rec = convertLocalToScene(getClientArea());
@@ -156,18 +152,17 @@
@Override
public void windowClosed(WindowEvent _e) {
- if (frame_ != null)
- frame_.dispose();
+ if (frame_ != null) frame_.dispose();
frame_ = null;
}
@Override
public void windowClosing(WindowEvent _e) {
// setPreferredSize(calquePanel_.getVueCalque().getSize());
- zoom_ = calquePanel_.getVueCalque().getViewBoite();
+ // zoom_ = calquePanel_.getVueCalque().getViewBoite();
image = null;
getEbliScene().refresh();
- // YODA:RAJOUTER LE GRAPHE DANS EDITOR TU DOIS CAR DANS FRAME IL
+ // YODA:RAJOUTER LE GRAPHE DANS EDITOR TU DOIS CAR DANS FRAME IL
// EST
conteneurEditor.add(calquePanel_, BorderLayout.CENTER);
}
@@ -191,6 +186,8 @@
}
}
+ boolean first_ = true;
+
@SuppressWarnings("unchecked")
@Override
protected void paintWidget() {
@@ -200,11 +197,15 @@
if (frame_ == null) {
initSize(rec);
- if (zoom_ != null) {
- // image=null;
- calquePanel_.getVueCalque().changeRepere(this, zoom_);
-
- } else calquePanel_.restaurer();
+ if (first_) {
+ first_ = false;
+ calquePanel_.restaurer();
+ }
+ // if (zoom_ != null) {
+ // // image=null;
+ // calquePanel_.getVueCalque().changeRepere(this, zoom_);
+ //
+ // } else calquePanel_.restaurer();
}
// mode edition
@@ -219,7 +220,6 @@
g.drawImage(image, rec.x, rec.y, rec.width, rec.height, null);
}
-
/**
* Surcharge de la creation du menu de base en ajoutant les menus specifiques
*/
@@ -228,16 +228,16 @@
public JPopupMenu getPopupMenu(Widget widget, Point localLocation) {
JPopupMenu popup = new JPopupMenu();
- // -- Menu sp\xF6cifiques a l'application--//
+ // -- Menu sp\xF6cifiques a l'application--//
constructPopupMenuSpecifique(popup);
// -- creation du menu commun a tous les widgets
constructPopupMenuBase(popup);
-
return popup;
}
}));
}
+
private void constructPopupMenuSpecifique(JPopupMenu _popup) {
JMenuItem menuItem = _popup.add("Ajouter la l\xE9gende");
menuItem.setIcon(CtuluResource.CTULU.getIcon("crystal_commentaire"));
@@ -252,15 +252,13 @@
Point nouvellePosition = new Point((int) (EbliWidgetVueCalque.this.getLocation().x),
(int) (EbliWidgetVueCalque.this.getLocation().y + EbliWidgetVueCalque.this.getBounds().height * 1.2));
-
if (!EbliWidgetVueCalque.this.getEbliScene().isObject(nodeLegende)) {
-
nodeLegende = new EbliNodeDefault();
// nodeLegende.setTitle("Legende calque");
//
// if (calquePanel_.getCqLegend()==null)
- //JOptionPane.showMessageDialog(null,"calquePqnel.getCqlegend null")
+ // JOptionPane.showMessageDialog(null,"calquePqnel.getCqlegend null")
// ;
// nodeLegende.setCreator(new
// EbliWidgetCreatorCalqueLegende(calquePanel_.getCqLegend()));
@@ -272,7 +270,6 @@
// methode qui permet d ajouter une legemde
calquePanel_.addWidgetLegendeCalque();
-
EbliWidgetVueCalque.this.getEbliScene().refresh();
}
@@ -282,31 +279,24 @@
});
-
}
-
-
public EnumSet<org.netbeans.api.visual.action.InplaceEditorProvider.ExpansionDirection> getExpansionDirections(
- org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller, Widget widget,
- BuPanel editor) {
+ org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller, Widget widget, BuPanel editor) {
return null;
}
public Rectangle getInitialEditorComponentBounds(
- org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller, Widget widget,
- BuPanel editor,
+ org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller, Widget widget, BuPanel editor,
Rectangle viewBounds) {
- return null;
+ return convertLocalToScene(getClientArea());
}
-
-
public void notifyOpened(org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller,
Widget widget, BuPanel editor) {
+ calquePanel_.setBorder(BorderFactory.createLineBorder(Color.GRAY, 1));
}
-
// public void setColorFond(Color newColor) {
// couleurFond = newColor;
// repaint();
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliWidgetJXTreeTableModel.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliWidgetJXTreeTableModel.java 2008-08-21 15:27:05 UTC (rev 3830)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliWidgetJXTreeTableModel.java 2008-08-21 20:14:24 UTC (rev 3831)
@@ -8,21 +8,22 @@
import org.fudaa.ctulu.CtuluLibString;
import org.fudaa.ebli.commun.EbliLib;
+import org.fudaa.ebli.visuallibrary.DefaultObjectSceneListener;
import org.fudaa.ebli.visuallibrary.EbliNode;
-import org.fudaa.ebli.visuallibrary.EbliNodeListener;
import org.fudaa.ebli.visuallibrary.EbliScene;
import org.jdesktop.swingx.treetable.DefaultTreeTableModel;
import org.jdesktop.swingx.treetable.MutableTreeTableNode;
import org.jdesktop.swingx.treetable.TreeTableNode;
+import org.netbeans.api.visual.model.ObjectSceneEvent;
+import org.netbeans.api.visual.model.ObjectSceneEventType;
+import org.netbeans.api.visual.model.ObjectSceneListener;
/**
- * Model du treetable. contient 3 colonnes: colonne 1:icone colonne 2:nom
- * colonne 3:checkbox associee
+ * Model du treetable. contient 3 colonnes: colonne 1:icone colonne 2:nom colonne 3:checkbox associee
*
* @author Adrien Hadoux
- *
*/
-public class EbliWidgetJXTreeTableModel extends DefaultTreeTableModel implements EbliNodeListener {
+public class EbliWidgetJXTreeTableModel extends DefaultTreeTableModel {
// -- le nombre de colonnes est statique --//
// final static int NBCOLUMN = 3;
@@ -33,6 +34,7 @@
private static final String[] title = { "", EbliLib.getS("Nom"), "V" };
final EbliScene scene_;
+ final ObjectSceneListener sceneListener_;
/**
* constructeur.
@@ -43,7 +45,23 @@
public EbliWidgetJXTreeTableModel(EbliScene _scene) {
super(EbliWidgetTreeTableNode.build(_scene));
scene_ = _scene;
+ sceneListener_ = new DefaultObjectSceneListener() {
+ @Override
+ public void objectAdded(ObjectSceneEvent _event, Object _addedObject) {
+ nodeAdded((EbliNode) _addedObject);
+ }
+
+ @Override
+ public void objectRemoved(ObjectSceneEvent _event, Object _removedObject) {
+ nodeRemoved((EbliNode) _removedObject);
+ }
+ };
+ scene_.addObjectSceneListener(sceneListener_, ObjectSceneEventType.OBJECT_ADDED,ObjectSceneEventType.OBJECT_REMOVED);
}
+
+ public void removeListener(){
+ scene_.removeObjectSceneListener(sceneListener_, ObjectSceneEventType.OBJECT_ADDED,ObjectSceneEventType.OBJECT_REMOVED);
+ }
public EbliScene getScene() {
return scene_;
@@ -126,8 +144,6 @@
return CtuluLibString.EMPTY_STRING;
}
-
-
// /**
// * Raffraichissement maison du jxtreetable
// */
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestGraphe2.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestGraphe2.java 2008-08-21 15:27:05 UTC (rev 3830)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestGraphe2.java 2008-08-21 20:14:24 UTC (rev 3831)
@@ -337,7 +337,6 @@
final BuPanel p = new BuPanel();
p.setLayout(new BuBorderLayout());
EbliWidgetJXTreeTableModel tree = new EbliWidgetJXTreeTableModel(scene);
- scene.addEbliNodeListener(tree);
// FIXME: mettre tout cela dans la construction de EbliWidgetJXTree
// EbliCheckBoxTreeRenderer renderer = new EbliCheckBoxTreeRenderer();
// tree.setCellRenderer(renderer);
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutPanelController.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutPanelController.java 2008-08-21 15:27:05 UTC (rev 3830)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutPanelController.java 2008-08-21 20:14:24 UTC (rev 3831)
@@ -79,7 +79,6 @@
TrPostLayoutPanelController(EbliScene _scene, TrPostProjet _projet) {
treeModel_ = new EbliWidgetJXTreeTableModel(_scene);
- _scene.addEbliNodeListener(treeModel_);
_scene.setCmdMng(new CtuluCommandManager());
projet_ = _projet;
}
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostVisuPanel.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostVisuPanel.java 2008-08-21 15:27:05 UTC (rev 3830)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostVisuPanel.java 2008-08-21 20:14:24 UTC (rev 3831)
@@ -16,11 +16,14 @@
import javax.swing.InputMap;
import javax.swing.JComponent;
import javax.swing.JFrame;
+import javax.swing.JPanel;
import javax.swing.KeyStroke;
+import javax.swing.SwingUtilities;
import org.fudaa.ctulu.CtuluResource;
import org.fudaa.ctulu.CtuluUI;
import org.fudaa.ctulu.gui.CtuluLibDialog;
+import org.fudaa.ctulu.gui.CtuluLibSwing;
import org.fudaa.ctulu.gui.CtuluTaskOperationGUI;
import org.fudaa.dodico.h2d.type.H2dVariableType;
import org.fudaa.ebli.animation.ActionAnimationTreeSelection;
@@ -104,6 +107,8 @@
TrPostInfoDelegate info_;
+ final JComponent suiviPanel_;
+
public TrPostVisuPanel(final FudaaCommonImplementation _impl, final TrPostProjet _controller) {
this(_impl, _controller, false);
}
@@ -146,12 +151,22 @@
getDonneesCalque().enDernier(gc);
gc.putClientProperty(Action.SHORT_DESCRIPTION, TrResource.getS("Affichage des images de fond"));
getArbreCalqueModel().setSelectionCalque(isoLayer_);
- //TODO Fred a enlever
- // removeCalqueLegend();
-
+ // TODO Fred a enlever
+ removeCalqueLegend();
+
+ suiviPanel_ = (JPanel) CtuluLibSwing.findChildByName(this, "pnSuivis");
+ remove(suiviPanel_);
+
}
/**
+ * @return the suiviPanel
+ */
+ public JComponent getSuiviPanel() {
+ return suiviPanel_;
+ }
+
+ /**
* Methode qui ajoute une widget de legende de calque.
*/
public void addWidgetLegendeCalque() {
@@ -164,8 +179,7 @@
// rafraichissement de la scene
this.getProjet().filleLayout_.controller_.getScene().refresh();
-
-
+
}
// BCalqueLegende malegende = new BCalqueLegende();
@@ -368,8 +382,7 @@
}
/*
- * protected void anim(){ if (anim_ == null) anim_ = new EbliAnimation(this);
- * anim_.go(); }
+ * protected void anim(){ if (anim_ == null) anim_ = new EbliAnimation(this); anim_.go(); }
*/
public void dataRemoved(final H2dVariableType[] _vars, final boolean _isFleche) {
@@ -476,30 +489,28 @@
}
/**
- * duplication du trPostVisuPanel. surcharge de la duplication du
- * zeblicalquePanel.
+ * duplication du trPostVisuPanel. surcharge de la duplication du zeblicalquePanel.
*/
- public TrPostVisuPanel duplicate(){
-
+ public TrPostVisuPanel duplicate() {
+
final TrPostVisuPanel duplic = new TrPostVisuPanel(this.getImpl(), this.getProjet());
// -- duplication du layer qui contient les memes proprietes --//
duplic.isoLayer_ = (TrIsoLayer) this.isoLayer_.duplicate();
-
-
-
+
// -- duplication des donnees via sauvegarde thread--//
new CtuluTaskOperationGUI(this.impl_, TrResource.getS("Enregistrement")) {
public void act() {
-
+
// -- sauvegarde de l etat --//
- BCalqueSaverInterface savedData= getDonneesCalque().getPersistenceMng().save(getDonneesCalque(),impl_.createProgressionInterface(this));
-
+ BCalqueSaverInterface savedData = getDonneesCalque().getPersistenceMng().save(getDonneesCalque(),
+ impl_.createProgressionInterface(this));
+
// -- chargement de l etat dans le calque duplique --//
duplic.getDonneesCalque().getPersistenceMng().restore(savedData, duplic, duplic.getDonneesCalque(),
impl_.createProgressionInterface(this));
-
- // -- destruction des calques doublons du duplic pour recuperer une
+
+ // -- destruction des calques doublons du duplic pour recuperer une
// bonne arborescence --//
// BCalque[] liste = duplic.getDonneesCalque().getCalques();
@@ -517,20 +528,11 @@
// }
//
// }
-
-
+
}
}.start();
-
-
-
-
-
-
-
-
+
return duplic;
}
-
-
+
}
\ No newline at end of file
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/prepro/build.xml
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/prepro/build.xml 2008-08-21 15:27:05 UTC (rev 3830)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/prepro/build.xml 2008-08-21 20:14:24 UTC (rev 3831)
@@ -194,6 +194,9 @@
<library jar="${ctulu.lib.dir}/fgis.jar" />
<library jar="${ctulu.lib.dir}/looks.jar" />
<library jar="${ctulu.lib.dir}/jep.jar" />
+ <library jar="${ctulu.lib.dir}/commons-logging-1.1.jar" />
+ <library jar="${ctulu.lib.dir}/flexdock-0.5.1.jar" />
+ <library jar="${ctulu.lib.dir}/skinlf.jar" />
<!--Classes appel\xE9es par reflexion-->
<class>
<fileset dir="${fudaa.dist.classes.dir}">
Modified: branches/Prepro-0.92-SNAPSHOT/fudaaFormatage.xml
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaaFormatage.xml 2008-08-21 15:27:05 UTC (rev 3830)
+++ branches/Prepro-0.92-SNAPSHOT/fudaaFormatage.xml 2008-08-21 20:14:24 UTC (rev 3831)
@@ -9,7 +9,7 @@
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
@@ -17,9 +17,9 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
@@ -68,7 +68,7 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
@@ -88,13 +88,13 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
@@ -134,7 +134,7 @@
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
@@ -166,8 +166,8 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
@@ -179,7 +179,7 @@
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
-<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
@@ -203,7 +203,7 @@
<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
@@ -216,7 +216,7 @@
<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
@@ -234,7 +234,7 @@
<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
@@ -262,6 +262,6 @@
<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="true"/>
</profile>
</profiles>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
