Author: dazarov Date: 2008-12-16 12:10:29 -0500 (Tue, 16 Dec 2008) New Revision: 12626 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/PagesEditor.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ExceptionEditPart.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/LinkEditPart.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PageEditPart.java 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/figures/ExceptionFigure.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/NodeFigure.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/PageFigure.java Log: https://jira.jboss.org/jira/browse/JBIDE-3409 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 15:52:21 UTC (rev 12625) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesPreference.java 2008-12-16 17:10:29 UTC (rev 12626) @@ -1,5 +1,6 @@ package org.jboss.tools.seam.pages.xml.model; +import org.eclipse.swt.graphics.Font; import org.jboss.tools.common.model.options.Preference; import org.jboss.tools.jst.web.WebPreference; @@ -11,9 +12,53 @@ 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"); + public static final Preference LINK_PATH_FONT = new SeamPagesPreference(SEAM_PAGES_EDITOR_PATH, "Link Path Font"); + public static final Preference VIEW_PATH_FONT = new SeamPagesPreference(SEAM_PAGES_EDITOR_PATH, "View Path Font"); protected SeamPagesPreference(String optionPath, String attributeName) { super(optionPath, attributeName); } + + public static Font getFont(String preferenceValue, Font font) { + String name; + int size = 8, style = 1; + int pos, pos2, pos3; + pos = preferenceValue.indexOf(","); + if (pos < 0) + name = preferenceValue; + else { + name = preferenceValue.substring(0, pos); + pos2 = preferenceValue.indexOf("size="); + if (pos2 >= 0) { + pos3 = preferenceValue.indexOf(",", pos2); + if (pos3 < 0) + size = Integer.parseInt(preferenceValue + .substring(pos2 + 5, preferenceValue.length())); + else + size = Integer.parseInt(preferenceValue.substring(pos2 + 5, pos3)); + } + pos2 = preferenceValue.indexOf("style="); + if (pos2 >= 0) { + pos3 = preferenceValue.indexOf(",", pos2); + if (pos3 < 0) + style = Integer.parseInt(preferenceValue.substring(pos2 + 6, preferenceValue + .length())); + else + style = Integer.parseInt(preferenceValue.substring(pos2 + 6, pos3)); + } + } + + if (font == null) { + font = new Font(null, name, size, style); + } else { + if (!font.getFontData()[0].getName().equals(name) + || font.getFontData()[0].getHeight() != size + || font.getFontData()[0].getStyle() != style) { + font = new Font(null, name, size, style); + } + } + + return font; + } } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/PagesEditor.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/PagesEditor.java 2008-12-16 15:52:21 UTC (rev 12625) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/PagesEditor.java 2008-12-16 17:10:29 UTC (rev 12626) @@ -91,7 +91,11 @@ import org.jboss.tools.common.gef.outline.xpl.DiagramContentOutlinePage; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.XModelTransferBuffer; +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.jst.web.model.ReferenceObject; +import org.jboss.tools.seam.pages.xml.model.SeamPagesPreference; import org.jboss.tools.seam.pages.xml.model.handlers.SelectOnDiagramHandler; import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesDiagramStructureHelper; import org.jboss.tools.seam.ui.pages.SeamUIPagesMessages; @@ -114,7 +118,7 @@ import org.jboss.tools.seam.ui.pages.editor.figures.NodeFigure; import org.jboss.tools.seam.ui.pages.editor.palette.PagesPaletteViewerPreferences; -public class PagesEditor extends GEFEditor implements PagesModelListener{ +public class PagesEditor extends GEFEditor implements PagesModelListener, XModelTreeListener{ protected void createPaletteViewer(Composite parent) { PaletteViewer viewer = new PaletteViewer(); @@ -291,7 +295,7 @@ } public void dispose() { - //model.removeModelListener(this); + PreferenceModelUtilities.getPreferenceModel().removeModelTreeListener(this); super.dispose(); } @@ -521,12 +525,11 @@ public void setInput(XModelObject input) { } - static private boolean switchToSelectionTool = false; + static private boolean switchToSelectionTool = SeamPagesPreference.ENABLE_CONTROL_MODE_ON_TRANSITION_COMPLETED.getValue().equals("yes"); public void setPagesModel(PagesModel diagram) { model = diagram; - //model.addModelListener(this); - //switchToSelectionTool = model.getOptions().switchToSelectionTool(); + PreferenceModelUtilities.getPreferenceModel().addModelTreeListener(this); } private void setSavePreviouslyNeeded(boolean value) { @@ -644,14 +647,16 @@ protected void hookGraphicalViewer() { getSelectionSynchronizer().addViewer(getGraphicalViewer()); } - - -// public void processChanged(boolean flag) { -// if (switchToSelectionTool != model.getOptions().switchToSelectionTool()) { -// switchToSelectionTool = model.getOptions().switchToSelectionTool(); -// connectionCreationTool.setUnloadWhenFinished(switchToSelectionTool); -// } -// } - + public void nodeChanged(XModelTreeEvent event){ + String path = event.getModelObject().getPath(); + if(path.equals(SeamPagesPreference.SEAM_PAGES_EDITOR_PATH)){ + switchToSelectionTool = SeamPagesPreference.ENABLE_CONTROL_MODE_ON_TRANSITION_COMPLETED.getValue().equals("yes"); + connectionCreationTool.setUnloadWhenFinished(switchToSelectionTool); + } + } + + public void structureChanged(XModelTreeEvent event){ + + } } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ExceptionEditPart.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ExceptionEditPart.java 2008-12-16 15:52:21 UTC (rev 12625) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ExceptionEditPart.java 2008-12-16 17:10:29 UTC (rev 12626) @@ -33,13 +33,18 @@ import org.eclipse.gef.requests.DropRequest; import org.eclipse.swt.accessibility.AccessibleControlEvent; 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.editor.ecore.pages.Link; import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PageException; import org.jboss.tools.seam.ui.pages.editor.figures.ExceptionFigure; import org.jboss.tools.seam.ui.pages.editor.figures.NodeFigure; import org.jboss.tools.seam.ui.pages.editor.figures.xpl.CompressNameUtil; -public class ExceptionEditPart extends PagesEditPart implements PropertyChangeListener, EditPartListener, Adapter { +public class ExceptionEditPart extends PagesEditPart implements PropertyChangeListener, EditPartListener, +Adapter, XModelTreeListener { private NodeFigure fig = null; private boolean single = true; @@ -129,6 +134,18 @@ installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new ViewIDDirectEditPolicy()); } + + public void nodeChanged(XModelTreeEvent event){ + String path = event.getModelObject().getPath(); + if(path.equals(SeamPagesPreference.SEAM_PAGES_EDITOR_PATH)){ + NodeFigure.nodeLabelFont = SeamPagesPreference.getFont(SeamPagesPreference.VIEW_PATH_FONT.getValue(), NodeFigure.nodeLabelFont); + refreshVisuals(); + } + } + + public void structureChanged(XModelTreeEvent event){ + + } /** * Returns a newly created Figure to represent this. @@ -241,6 +258,7 @@ if (isActive()) return; ((Notifier) getModel()).eAdapters().add(this); + PreferenceModelUtilities.getPreferenceModel().addModelTreeListener(this); super.activate(); if("<initialize>".equals(getExceptionModel().getName())){ getExceptionModel().setName(""); @@ -254,6 +272,7 @@ if (!isActive()) return; ((Notifier) getModel()).eAdapters().remove(this); + PreferenceModelUtilities.getPreferenceModel().removeModelTreeListener(this); super.deactivate(); } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/LinkEditPart.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/LinkEditPart.java 2008-12-16 15:52:21 UTC (rev 12625) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/LinkEditPart.java 2008-12-16 17:10:29 UTC (rev 12626) @@ -30,7 +30,6 @@ import org.eclipse.gef.editparts.AbstractConnectionEditPart; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.graphics.Font; import org.eclipse.swt.graphics.Image; @@ -38,7 +37,11 @@ import org.jboss.tools.common.gef.figures.GEFLabel; import org.jboss.tools.common.gef.figures.xpl.CustomLocator; import org.jboss.tools.common.model.XModelObject; +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.common.model.util.XModelUtil; +import org.jboss.tools.seam.pages.xml.model.SeamPagesPreference; import org.jboss.tools.seam.ui.pages.editor.PagesEditor; import org.jboss.tools.seam.ui.pages.editor.PagesEditor.ModelSelectionProvider; import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Link; @@ -48,11 +51,11 @@ import org.jboss.tools.seam.ui.pages.editor.figures.FigureFactory; public class LinkEditPart extends AbstractConnectionEditPart implements - PropertyChangeListener, EditPartListener { + PropertyChangeListener, EditPartListener, XModelTreeListener { private static final Image icon = ImageDescriptor.createFromFile( PagesEditor.class, "icons/shortcut.gif").createImage(); - private static final Font pathFont = new Font(null, "default", 8, SWT.NONE); + private static final Font pathFont = SeamPagesPreference.getFont(SeamPagesPreference.LINK_PATH_FONT.getValue(), null); AccessibleEditPart acc; @@ -73,13 +76,22 @@ public void setEditor(PagesEditor editor){ this.editor = editor; } + + private boolean showShortcutPath(){ + return SeamPagesPreference.SHOW_SHORTCUT_PATH.getValue().equals("yes"); + } + private boolean showShortcutIcon(){ + return SeamPagesPreference.SHOW_SHORTCUT_ICON.getValue().equals("yes"); + } + public void activate() { if (!isActive()) { ((Notifier) getModel()).eAdapters().add(adapter); } super.activate(); addEditPartListener(this); + PreferenceModelUtilities.getPreferenceModel().addModelTreeListener(this); Page page=null; if(getLinkModel().getFromElement() instanceof Page) page = (Page)getLinkModel().getFromElement(); @@ -133,15 +145,14 @@ conn.add(pathLabel, pathLocator); String text = ""; -// if (getLink().getJSFModel().getOptions().showShortcutPath()) + if (showShortcutPath()) if(getLink().getToElement() != null) text = getLink().getToElement().getName(); shortcutLabel = new GEFLabel(text, FigureFactory.normalColor); -// if (getLink().getJSFModel().getOptions().showShortcutIcon()) + if (showShortcutIcon()) shortcutLabel.setIcon(icon); -// shortcutLabel.setFont(getLink().getJSFModel().getOptions() -// .getLinkPathFont()); + shortcutLabel.setFont(pathFont); shortcutLabel.setTextAlignment(Label.LEFT); shortcutLabel.setLabelAlignment(Label.LEFT); shortcutLabel.setIconAlignment(Label.LEFT); @@ -172,12 +183,23 @@ if(pagePart != null) pagePart.removeEditPartListener(this); removeEditPartListener(this); - //getLink().removePropertyChangeListener(this); + PreferenceModelUtilities.getPreferenceModel().removeModelTreeListener(this); if (isActive()) { ((Notifier) getModel()).eAdapters().remove(this); } super.deactivate(); } + + public void nodeChanged(XModelTreeEvent event){ + String path = event.getModelObject().getPath(); + if(path.equals(SeamPagesPreference.SEAM_PAGES_EDITOR_PATH)){ + linkChange(getLink()); + } + } + + public void structureChanged(XModelTreeEvent event){ + + } public void deactivateFigure() { getFigure().removePropertyChangeListener( @@ -254,16 +276,22 @@ } public void linkChange(Link source) { + pathLabel.setFont(SeamPagesPreference.getFont(SeamPagesPreference.LINK_PATH_FONT.getValue(), pathFont)); pathLabel.setText(getLink().getName()); -// if (getLinkModel().getJSFModel().getOptions().showShortcutPath()) - if(getLink().getToElement() != null) - shortcutLabel.setText(getLink().getToElement().getName()); - else + + if (showShortcutPath()){ + shortcutLabel.setFont(SeamPagesPreference.getFont(SeamPagesPreference.LINK_PATH_FONT.getValue(), pathFont)); + if(getLink().getToElement() != null) + shortcutLabel.setText(getLink().getToElement().getName()); + else + shortcutLabel.setText(""); + }else shortcutLabel.setText(""); -// if (getLinkModel().getJSFModel().getOptions().showShortcutIcon()) + + if (showShortcutIcon()) shortcutLabel.setIcon(icon); -// else -// shortcutLabel.setIcon(null); + else + shortcutLabel.setIcon(null); getLinkFigure().refreshFont(); if (shortcut != getLink().isShortcut()) { @@ -277,9 +305,6 @@ } refresh(); } - - - } public void childAdded(EditPart child, int index) { @@ -331,7 +356,7 @@ refreshVisuals(); ((ConnectionFigure)figure).layout(); } - + /** * ) * Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PageEditPart.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PageEditPart.java 2008-12-16 15:52:21 UTC (rev 12625) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PageEditPart.java 2008-12-16 17:10:29 UTC (rev 12626) @@ -40,7 +40,11 @@ import org.jboss.tools.common.meta.action.XAction; import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; +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.common.model.ui.dnd.DnDUtil; +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.PagesEditor; import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Link; @@ -49,7 +53,7 @@ import org.jboss.tools.seam.ui.pages.editor.figures.PageFigure; public class PageEditPart extends PagesEditPart implements - PropertyChangeListener, EditPartListener, Adapter { + PropertyChangeListener, EditPartListener, Adapter, XModelTreeListener { private PageFigure fig = null; PagesEditor editor; @@ -98,6 +102,18 @@ } } + + public void nodeChanged(XModelTreeEvent event){ + String path = event.getModelObject().getPath(); + if(path.equals(SeamPagesPreference.SEAM_PAGES_EDITOR_PATH)){ + NodeFigure.nodeLabelFont = SeamPagesPreference.getFont(SeamPagesPreference.VIEW_PATH_FONT.getValue(), NodeFigure.nodeLabelFont); + refreshVisuals(); + } + } + + public void structureChanged(XModelTreeEvent event){ + + } public boolean isGroupListenerEnable() { return true; @@ -278,6 +294,7 @@ if (isActive()) return; ((Notifier) getModel()).eAdapters().add(this); + PreferenceModelUtilities.getPreferenceModel().addModelTreeListener(this); super.activate(); if("<initialize>".equals(getPageModel().getName())){ getPageModel().setName(""); @@ -291,6 +308,7 @@ if (!isActive()) return; ((Notifier) getModel()).eAdapters().remove(this); + PreferenceModelUtilities.getPreferenceModel().removeModelTreeListener(this); super.deactivate(); } 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 15:52:21 UTC (rev 12625) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesDiagramEditPart.java 2008-12-16 17:10:29 UTC (rev 12626) @@ -35,14 +35,11 @@ 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.PagesModel; import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesModelListener; @@ -78,7 +75,6 @@ */ public void setModel(Object model) { super.setModel(model); - PreferenceModelUtilities.getPreferenceModel().addModelTreeListener(this); } /** @@ -286,6 +282,7 @@ if (isActive()) return; ((Notifier) getModel()).eAdapters().add(this); + PreferenceModelUtilities.getPreferenceModel().addModelTreeListener(this); super.activate(); } @@ -293,6 +290,7 @@ if (!isActive()) return; ((Notifier) getModel()).eAdapters().remove(this); + PreferenceModelUtilities.getPreferenceModel().removeModelTreeListener(this); super.deactivate(); } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ExceptionFigure.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ExceptionFigure.java 2008-12-16 15:52:21 UTC (rev 12625) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ExceptionFigure.java 2008-12-16 17:10:29 UTC (rev 12626) @@ -24,6 +24,7 @@ import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Image; import org.jboss.tools.common.gef.GEFGraphicalViewer; +import org.jboss.tools.seam.pages.xml.model.SeamPagesPreference; import org.jboss.tools.seam.ui.pages.editor.PagesEditor; import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PageException; import org.jboss.tools.seam.ui.pages.editor.edit.ExceptionEditPart; Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/NodeFigure.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/NodeFigure.java 2008-12-16 15:52:21 UTC (rev 12625) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/NodeFigure.java 2008-12-16 17:10:29 UTC (rev 12626) @@ -12,12 +12,12 @@ import org.eclipse.draw2d.FigureUtilities; -import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Font; import org.eclipse.swt.graphics.Image; import org.jboss.tools.common.gef.figures.xpl.BaseNodeFigure; import org.jboss.tools.common.model.ui.ModelUIImages; +import org.jboss.tools.seam.pages.xml.model.SeamPagesPreference; import org.jboss.tools.seam.ui.pages.editor.figures.xpl.FixedConnectionAnchor; public class NodeFigure extends @@ -25,7 +25,7 @@ public final static Color ghostFillColor = new Color(null, 31, 31, 31); - public static final Font nodeLabelFont = new Font(null, "default", 8, SWT.BOLD); // TODO: use preference font mechanism for this + public static Font nodeLabelFont = SeamPagesPreference.getFont(SeamPagesPreference.VIEW_PATH_FONT.getValue(), null); public static final Color lightGrayColor = new Color(null, 0xf1, 0xf1, 0xf1); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/PageFigure.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/PageFigure.java 2008-12-16 15:52:21 UTC (rev 12625) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/PageFigure.java 2008-12-16 17:10:29 UTC (rev 12626) @@ -25,6 +25,7 @@ import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Image; import org.jboss.tools.common.model.XModelObject; +import org.jboss.tools.seam.pages.xml.model.SeamPagesPreference; import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesDiagramStructureHelper; import org.jboss.tools.seam.ui.pages.editor.PagesEditor; import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Page;