Author: dazarov Date: 2008-12-16 08:53:24 -0500 (Tue, 16 Dec 2008) New Revision: 12622 Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesPreference.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesDiagramEditPart.java Log: https://jira.jboss.org/jira/browse/JBIDE-3409 Show grid and grid step properties Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesPreference.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesPreference.java 2008-12-16 13:41:24 UTC (rev 12621) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesPreference.java 2008-12-16 13:53:24 UTC (rev 12622) @@ -9,6 +9,8 @@ public static final Preference ENABLE_CONTROL_MODE_ON_TRANSITION_COMPLETED = new SeamPagesPreference(SEAM_PAGES_EDITOR_PATH, "enableControlModeOnTransitionCompleted"); public static final Preference SHOW_SHORTCUT_ICON = new SeamPagesPreference(SEAM_PAGES_EDITOR_PATH, "showShortcutIcon"); public static final Preference SHOW_SHORTCUT_PATH = new SeamPagesPreference(SEAM_PAGES_EDITOR_PATH, "showShortcutPath"); + public static final Preference SHOW_GRID = new SeamPagesPreference(SEAM_PAGES_EDITOR_PATH, "Show Grid"); + public static final Preference GRID_STEP = new SeamPagesPreference(SEAM_PAGES_EDITOR_PATH, "Grid Step"); protected SeamPagesPreference(String optionPath, String attributeName) { super(optionPath, attributeName); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesDiagramEditPart.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesDiagramEditPart.java 2008-12-16 13:41:24 UTC (rev 12621) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesDiagramEditPart.java 2008-12-16 13:53:24 UTC (rev 12622) @@ -10,7 +10,6 @@ ******************************************************************************/ package org.jboss.tools.seam.ui.pages.editor.edit; -import java.beans.PropertyChangeEvent; import java.util.ArrayList; import java.util.List; @@ -36,24 +35,22 @@ import org.eclipse.gef.rulers.RulerProvider; import org.eclipse.gef.tools.DeselectAllTracker; import org.eclipse.gef.tools.MarqueeDragTracker; +import org.eclipse.jface.util.IPropertyChangeListener; +import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.swt.accessibility.AccessibleEvent; +import org.jboss.tools.common.model.event.XModelTreeEvent; +import org.jboss.tools.common.model.event.XModelTreeListener; +import org.jboss.tools.common.model.options.PreferenceModelUtilities; +import org.jboss.tools.seam.pages.xml.model.SeamPagesPreference; +import org.jboss.tools.seam.ui.pages.SeamUiPagesPlugin; import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Page; -import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesElement; import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesModel; import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesModelListener; import org.jboss.tools.seam.ui.pages.editor.figures.DiagramFigure; public class PagesDiagramEditPart extends ContainerEditPart implements - LayerConstants, PagesModelListener, Adapter { - /* - * - */ - private boolean gridVisual = false; + LayerConstants, PagesModelListener, Adapter, XModelTreeListener{ - /* - * - */ - private int gridVisualStep = 8; /* * @@ -65,7 +62,7 @@ * @return */ public boolean isGridVisible() { - return gridVisual; + return SeamPagesPreference.SHOW_GRID.getValue().equals("yes"); } /** @@ -73,7 +70,7 @@ * @return */ public int getVisualGridStep() { - return gridVisualStep; + return Integer.parseInt(SeamPagesPreference.GRID_STEP.getValue()); } /** @@ -81,9 +78,7 @@ */ public void setModel(Object model) { super.setModel(model); - //((PagesModel) model).addModelListener(this); - //gridVisual = getPagesModel().getOptions().isGridVisible(); - //gridVisualStep = getPagesModel().getOptions().getVisualGridStep(); + PreferenceModelUtilities.getPreferenceModel().addModelTreeListener(this); } /** @@ -216,12 +211,17 @@ return null; } - /** - * - */ - public void propertyChange(PropertyChangeEvent evt) { + public void nodeChanged(XModelTreeEvent event){ + String path = event.getModelObject().getPath(); + if(path.equals(SeamPagesPreference.SEAM_PAGES_EDITOR_PATH)){ + refresh(); + } } - + + public void structureChanged(XModelTreeEvent event){ + + } + /** * */ @@ -325,5 +325,4 @@ */ public void setTarget(Notifier newTarget) { } - }