diff options
author | cbateman | 2006-11-22 19:31:27 +0000 |
---|---|---|
committer | cbateman | 2006-11-22 19:31:27 +0000 |
commit | ea2a101ddf171c5440035d5f41bdbcfab56d4dae (patch) | |
tree | 721d7d0f81a971937c829b3f98070663bb796eb7 | |
parent | 164b3b30cffdfb86f0207ddc71962f17fde3602f (diff) | |
download | webtools.jsf-ea2a101ddf171c5440035d5f41bdbcfab56d4dae.tar.gz webtools.jsf-ea2a101ddf171c5440035d5f41bdbcfab56d4dae.tar.xz webtools.jsf-ea2a101ddf171c5440035d5f41bdbcfab56d4dae.zip |
Code cleanup including:
- some deprecated fixes
- fixed some try-catch statements
- removed unnecessary casts
- renamed member shadowing locals
- removed unnecessary else statements
- commented out unused variables and dead code.
273 files changed, 2105 insertions, 2390 deletions
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/META-INF/MANIFEST.MF b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/META-INF/MANIFEST.MF index 1797b026b..3eb621e05 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/META-INF/MANIFEST.MF +++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/META-INF/MANIFEST.MF @@ -10,7 +10,8 @@ Require-Bundle: org.eclipse.jst.jsf.facesconfig.ui, org.eclipse.jst.jsf.facesconfig, org.eclipse.jst.pagedesigner, org.eclipse.jst.pagedesigner.jsp.core, - org.eclipse.wst.common.modulecore + org.eclipse.wst.common.modulecore, + org.eclipse.wst.common.ui.properties Eclipse-LazyStart: true Provide-Package: org.eclipse.jst.pagedesigner.jsf.core.dom, org.eclipse.jst.pagedesigner.jsf.ui, diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/JSFUIPlugin.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/JSFUIPlugin.java index 32382b2c9..e2b0dca9d 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/JSFUIPlugin.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/JSFUIPlugin.java @@ -132,7 +132,7 @@ public class JSFUIPlugin extends AbstractUIPlugin } ImageRegistry images = getImageRegistry(); - Image image = (Image) images.get(name); + Image image = images.get(name); if (image == null) { try diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/ActionsResources.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/ActionsResources.java index 4ebdc7e05..bfa8dd826 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/ActionsResources.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/ActionsResources.java @@ -26,6 +26,7 @@ public class ActionsResources private ActionsResources() { + // no external instantiation } public static String getString(String key) diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/JSFAddActionGroup.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/JSFAddActionGroup.java index 21a0232f2..1797cd282 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/JSFAddActionGroup.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/JSFAddActionGroup.java @@ -35,7 +35,8 @@ import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; */ public class JSFAddActionGroup { - public static Action action = new Action() { + private final static Action EMPTY_ACTION = new Action() { + // TODO: why? }; /* @@ -47,7 +48,7 @@ public class JSFAddActionGroup { final IJSFCoreSupport support) { final IMenuManager submenu = new MenuManager(ActionsResources .getString("Submenu.JSFAdd"));//$NON-NLS-1$ - submenu.add(action); + submenu.add(EMPTY_ACTION); submenu.addMenuListener(new IMenuListener() { public void menuAboutToShow(IMenuManager manager) { submenu.removeAll(); diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/JSFNavigationGroup.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/JSFNavigationGroup.java index 3f10fd072..d8fe22d7e 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/JSFNavigationGroup.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/JSFNavigationGroup.java @@ -29,10 +29,10 @@ import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; */ public class JSFNavigationGroup { - public static Action action = new Action() + private final static Action EMPTY_ACTION = new Action() { - } - ; + // TODO: why? + }; /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionGroup#fillContextMenu(org.eclipse.jface.action.IMenuManager) @@ -40,7 +40,7 @@ public class JSFNavigationGroup public void fillContextMenu(IMenuManager menu, final IDOMElement element, final IJSFCoreSupport support) { final IMenuManager submenu = new MenuManager(JSFUIPlugin.getResourceString("ElementEdit.Submenu.JavaNavigation"));//$NON-NLS-1$ - submenu.add(action); + submenu.add(EMPTY_ACTION); submenu.addMenuListener(new IMenuListener() { public void menuAboutToShow(IMenuManager manager) @@ -60,9 +60,9 @@ public class JSFNavigationGroup ExpressionAction action = new ExpressionAction(ExpressionAction.METHOD); action.setText(JSFUIPlugin.getResourceString("ElementEdit.Submenu.JavaNavigation.Action"));//$NON-NLS-1$ action.setActionValue(ele.getAttribute(ICSSPropertyID.ATTR_ACTION)); - if (ele instanceof IDOMElement) + if (ele != null) { - IDOMModel model = ((IDOMElement) ele).getModel(); + IDOMModel model = ele.getModel(); action.setProject(StructuredModelUtil.getProjectFor(model)); action.setFile(StructuredModelUtil.getFileFor(model)); } @@ -73,9 +73,9 @@ public class JSFNavigationGroup ExpressionAction action = new ExpressionAction(ExpressionAction.VARIABLE); action.setText(JSFUIPlugin.getResourceString("ElementEdit.Submenu.JavaNavigation.Value"));//$NON-NLS-1$ action.setActionValue(ele.getAttribute(ICSSPropertyID.ATTR_VALUE)); - if (ele instanceof IDOMElement) + if (ele != null) { - IDOMModel model = ((IDOMElement) ele).getModel(); + IDOMModel model = ele.getModel(); action.setProject(StructuredModelUtil.getProjectFor(model)); action.setFile(StructuredModelUtil.getFileFor(model)); } @@ -86,9 +86,9 @@ public class JSFNavigationGroup ExpressionAction action = new ExpressionAction(ExpressionAction.VARIABLE); action.setText(JSFUIPlugin.getResourceString("ElementEdit.Submenu.JavaNavigation.Binding"));//$NON-NLS-1$ action.setActionValue(ele.getAttribute(ICSSPropertyID.ATTR_BINDING)); - if (ele instanceof IDOMElement) + if (ele != null) { - IDOMModel model = ((IDOMElement) ele).getModel(); + IDOMModel model = ele.getModel(); action.setProject(StructuredModelUtil.getProjectFor(model)); action.setFile(StructuredModelUtil.getFileFor(model)); } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/attributegroup/AttributeData.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/attributegroup/AttributeData.java index 3807b7d93..5f0433a83 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/attributegroup/AttributeData.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/attributegroup/AttributeData.java @@ -30,7 +30,7 @@ public class AttributeData public AttributeData() { - + // TODO: do we need this constructor? } public AttributeData(String uri,String elementName,String name) diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/attributegroup/CommonDialogFieldWizard.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/attributegroup/CommonDialogFieldWizard.java index 892075e5c..4604e4098 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/attributegroup/CommonDialogFieldWizard.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/attributegroup/CommonDialogFieldWizard.java @@ -11,8 +11,6 @@ *******************************************************************************/ package org.eclipse.jst.pagedesigner.jsf.ui.attributegroup; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jst.pagedesigner.common.dialogfield.DialogFieldGroupPage; import org.eclipse.ui.internal.dialogs.NewWizard; @@ -43,18 +41,4 @@ public class CommonDialogFieldWizard extends NewWizard { addPage(mainPage); } - - /* (non-Javadoc) - * @see org.eclipse.jst.pagedesigner.wizards.NewWizard#doFinish(org.eclipse.core.runtime.IProgressMonitor) - */ - protected void doFinish(IProgressMonitor monitor) throws CoreException - { - } - - /* (non-Javadoc) - * @see org.eclipse.jst.pagedesigner.wizards.NewWizard#setupFinish() - */ - protected void setupFinish() - { - } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/celleditors/ConverterValidatorIdDialogField.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/celleditors/ConverterValidatorIdDialogField.java index 6bf29edff..365ed03df 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/celleditors/ConverterValidatorIdDialogField.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/celleditors/ConverterValidatorIdDialogField.java @@ -13,11 +13,8 @@ package org.eclipse.jst.pagedesigner.jsf.ui.celleditors; import java.util.Arrays; -import org.eclipse.core.resources.IProject; -import org.eclipse.jst.jsf.facesconfig.ui.IFacesConfigConstants; import org.eclipse.jst.pagedesigner.common.dialogfield.ComboDialogField; import org.eclipse.jst.pagedesigner.properties.attrgroup.IElementContextable; -import org.eclipse.jst.pagedesigner.utils.StructuredModelUtil; import org.eclipse.swt.SWT; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode; @@ -43,7 +40,6 @@ public class ConverterValidatorIdDialogField extends ComboDialogField implements */ public void setElementContext(IDOMNode ancester, IDOMElement element) { - IProject project = StructuredModelUtil.getProjectFor(element.getModel()); String[] results = null; if ("validator-id".equalsIgnoreCase(_elementId)) { diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/celleditors/JSFAttributeCellEditorFactory.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/celleditors/JSFAttributeCellEditorFactory.java index 0b12eb596..b56404bf4 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/celleditors/JSFAttributeCellEditorFactory.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/celleditors/JSFAttributeCellEditorFactory.java @@ -14,16 +14,13 @@ package org.eclipse.jst.pagedesigner.jsf.ui.celleditors; import java.util.HashMap; import java.util.Map; -import org.eclipse.core.resources.IProject; import org.eclipse.jface.viewers.CellEditor; import org.eclipse.jst.pagedesigner.common.dialogfield.DialogField; import org.eclipse.jst.pagedesigner.meta.IAttributeCellEditorFactory; import org.eclipse.jst.pagedesigner.meta.IAttributeDescriptor; import org.eclipse.jst.pagedesigner.properties.celleditors.LabeledComboBoxCellEditor; -import org.eclipse.jst.pagedesigner.utils.StructuredModelUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; import org.w3c.dom.Element; /** @@ -49,7 +46,6 @@ public class JSFAttributeCellEditorFactory implements IAttributeCellEditorFactor public CellEditor createCellEditor(Composite parent, IAttributeDescriptor attr, Element element) { String type = attr.getValueType(); - IProject project = StructuredModelUtil.getProjectFor(((IDOMElement) element).getModel()); String[] results = null; if (type.equalsIgnoreCase(CONVERTERID)) { diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/CommandResources.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/CommandResources.java index 9a2263d21..147bc3912 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/CommandResources.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/CommandResources.java @@ -18,7 +18,7 @@ import java.util.ResourceBundle; * @author mengbo * @version 1.5 */ -public class CommandResources +public final class CommandResources { private static final String BUNDLE_NAME = "org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml.CommandResources"; //$NON-NLS-1$ @@ -26,6 +26,7 @@ public class CommandResources private CommandResources() { + // no external instantiation } public static String getString(String key) diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/DataTableInsertColumnCommand.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/DataTableInsertColumnCommand.java index d33a75040..6ccf7f14d 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/DataTableInsertColumnCommand.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/DataTableInsertColumnCommand.java @@ -12,17 +12,15 @@ package org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml; import org.eclipse.jface.viewers.ISelection; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; - import org.eclipse.jst.pagedesigner.IJMTConstants; import org.eclipse.jst.pagedesigner.IJSFConstants; import org.eclipse.jst.pagedesigner.commands.DesignerCommand; import org.eclipse.jst.pagedesigner.jsf.core.dom.JSFDOMUtil; import org.eclipse.jst.pagedesigner.utils.JSPUtil; import org.eclipse.jst.pagedesigner.viewer.IHTMLGraphicalViewer; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; /** * Insert a column into dataTable. @@ -67,7 +65,7 @@ public class DataTableInsertColumnCommand extends DesignerCommand protected void doExecute() { String prefix = JSPUtil.getOrCreatePrefix(getModel(), IJMTConstants.URI_JSF_HTML, "h"); //$NON-NLS-1$ - _child = (IDOMElement) _dataTable.getOwnerDocument().createElement(prefix + ":column"); //$NON-NLS-1$ + _child = _dataTable.getOwnerDocument().createElement(prefix + ":column"); //$NON-NLS-1$ createHeaderFooter(_child); NodeList children = _dataTable.getChildNodes(); diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/PanelGridDeleteRowCommand.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/PanelGridDeleteRowCommand.java index 761a30794..71ccabf81 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/PanelGridDeleteRowCommand.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/PanelGridDeleteRowCommand.java @@ -74,10 +74,7 @@ public class PanelGridDeleteRowCommand extends DesignerCommand formatNode(_panelGridEle); return; } - else - { - removeRow--; - } + removeRow--; } if (removeRow < numRows) { @@ -93,14 +90,12 @@ public class PanelGridDeleteRowCommand extends DesignerCommand _panelGridEle.removeChild((Node) toRemove.get(i)); } formatNode(_panelGridEle); - return; } else { // must be footer. removeFooter(); formatNode(_panelGridEle); - return; } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/PanelGridInsertRowCommand.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/PanelGridInsertRowCommand.java index 3abb15071..74504ce76 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/PanelGridInsertRowCommand.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/PanelGridInsertRowCommand.java @@ -115,10 +115,7 @@ public class PanelGridInsertRowCommand extends DesignerCommand { return; } - else - { - insertRow--; - } + insertRow--; } //if (insertRow < numRows || ((insertRow == numRows) && (children.size() % columns == 0))) diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/ColumnTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/ColumnTagConverter.java index 31f98171c..9b887b210 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/ColumnTagConverter.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/ColumnTagConverter.java @@ -84,10 +84,8 @@ public class ColumnTagConverter extends AbstractTagConverter int index = 0; while (child != null) { - if (child instanceof Element && JSFDOMUtil.isFacet((Element) child)) - { - } - else + if (!(child instanceof Element) + || !JSFDOMUtil.isFacet((Element) child)) { addChild(child, new ConvertPosition(resultEle, index++)); } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/InputTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/InputTagConverter.java index 4fed1ca95..68bf63986 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/InputTagConverter.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/InputTagConverter.java @@ -69,10 +69,7 @@ public class InputTagConverter extends AbstractTagConverter String name = hostEle.getLocalName(); return name.substring(0, 1).toUpperCase() + name.substring(1); } - else - { - return mapValue(valueAttr); - } + return mapValue(valueAttr); } /** diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/MessagesTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/MessagesTagConverter.java index 7450b45f0..fc9b7ff07 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/MessagesTagConverter.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/MessagesTagConverter.java @@ -61,18 +61,15 @@ public class MessagesTagConverter extends AbstractTagConverter } return table; } - else + Element ul = createElement(IHTMLConstants.TAG_UL); + for (int i = 0; i < 2; i++) { - Element ul = createElement(IHTMLConstants.TAG_UL); - for (int i = 0; i < 2; i++) - { - Element li = createElement(IHTMLConstants.TAG_LI); - Element span = createSpan(); - li.appendChild(span); - ul.appendChild(li); - } - return ul; + Element li = createElement(IHTMLConstants.TAG_LI); + Element span = createSpan(); + li.appendChild(span); + ul.appendChild(li); } + return ul; } /* (non-Javadoc) diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/OutputTextTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/OutputTextTagConverter.java index d795999b1..491b81dbd 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/OutputTextTagConverter.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/OutputTextTagConverter.java @@ -82,10 +82,7 @@ public class OutputTextTagConverter extends AbstractTagConverter String name = hostEle.getLocalName(); return name.substring(0, 1).toUpperCase() + name.substring(1); } - else - { - return mapValue(valueAttr); - } + return mapValue(valueAttr); } /* (non-Javadoc) diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfcore/LoadBundleAction.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfcore/LoadBundleAction.java index d9fe467e6..e1b9f1001 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfcore/LoadBundleAction.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfcore/LoadBundleAction.java @@ -84,7 +84,7 @@ public class LoadBundleAction extends Action } else { - IEditorInput input = new JarEntryEditorInput((IStorage) storage); + IEditorInput input = new JarEntryEditorInput(storage); try { getPage().openEditor(input, "org.eclipse.ui.DefaultTextEditor");//$NON-NLS-1$ diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/DataTableElementEdit.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/DataTableElementEdit.java index 05e497093..7d0d9fe6c 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/DataTableElementEdit.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/DataTableElementEdit.java @@ -59,9 +59,10 @@ import org.eclipse.jst.pagedesigner.viewer.IHTMLGraphicalViewer; */ public class DataTableElementEdit extends DefaultJSFHTMLElementEdit { - public static Action action = new Action() - { - }; + private final static Action EMPTY_ACTION = new Action() + { + // TODO: why? + }; private final static int FAKE_INDEX = -10; /* (non-Javadoc) @@ -74,7 +75,7 @@ public class DataTableElementEdit extends DefaultJSFHTMLElementEdit final IMenuManager tableMenu = new MenuManager(JSFUIPlugin.getResourceString("ElementEdit.Submenu.DataTable"));//$NON-NLS-1$ final ElementEditPart editPart = (ElementEditPart) ((IDOMElement) ele).getAdapterFor(EditPart.class); // ok, we passed the checking, now let's create the actions. - tableMenu.add(action); + tableMenu.add(EMPTY_ACTION); tableMenu.addMenuListener(new IMenuListener() { public void menuAboutToShow(IMenuManager manager) @@ -104,7 +105,7 @@ public class DataTableElementEdit extends DefaultJSFHTMLElementEdit final IMenuManager tableMenu = new MenuManager(JSFUIPlugin.getResourceString("ElementEdit.Submenu.DataTable"));//$NON-NLS-1$ // ok, we passed the checking, now let's create the actions. - tableMenu.add(action); + tableMenu.add(EMPTY_ACTION); tableMenu.addMenuListener(new IMenuListener() { public void menuAboutToShow(IMenuManager manager) @@ -232,11 +233,8 @@ public class DataTableElementEdit extends DefaultJSFHTMLElementEdit // don't support insert row. return null; } - else - { - int index = tableInsertRequest.getIndex() + (tableInsertRequest.isBefore() ? 0 : 1); - return new DataTableInsertColumnCommand(viewer, dataTable, index); - } + int index = tableInsertRequest.getIndex() + (tableInsertRequest.isBefore() ? 0 : 1); + return new DataTableInsertColumnCommand(viewer, dataTable, index); } else if (request instanceof InsertHeaderFooterRequest) { @@ -269,10 +267,7 @@ public class DataTableElementEdit extends DefaultJSFHTMLElementEdit { return null; } - else - { - return new DataTableDeleteColumnCommand(viewer, dataTable, deleteReq.getIndex()); - } + return new DataTableDeleteColumnCommand(viewer, dataTable, deleteReq.getIndex()); } return super.getCommand(request); } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/PanelGridElementEdit.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/PanelGridElementEdit.java index 137576d40..32b412cf8 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/PanelGridElementEdit.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/PanelGridElementEdit.java @@ -57,9 +57,10 @@ import org.eclipse.jst.pagedesigner.viewer.IHTMLGraphicalViewer; */ public class PanelGridElementEdit extends DefaultJSFHTMLElementEdit { - public static Action action = new Action() - { - }; + private final static Action EMPTY_ACTION = new Action() + { + // TODO: why? + }; private final static int FAKE_INDEX = -10; /* (non-Javadoc) @@ -70,7 +71,7 @@ public class PanelGridElementEdit extends DefaultJSFHTMLElementEdit super.fillContextMenu(contextMenu, ele); final IMenuManager tableMenu = new MenuManager(JSFUIPlugin.getResourceString("ElementEdit.Submenu.PanelGrid"));//$NON-NLS-1$ - tableMenu.add(action); + tableMenu.add(EMPTY_ACTION); final ElementEditPart gridEditPart = (ElementEditPart) ((IDOMElement) ele).getAdapterFor(EditPart.class); // ok, we passed the checking, now let's create the actions. @@ -117,10 +118,7 @@ public class PanelGridElementEdit extends DefaultJSFHTMLElementEdit { return false; } - else - { - childEle = (Element) nodeBackup; - } + childEle = (Element) nodeBackup; } PanelGridUtil util = new PanelGridUtil(table); @@ -128,7 +126,7 @@ public class PanelGridElementEdit extends DefaultJSFHTMLElementEdit final int cellColumn = util.getDomColumnIndex(childEle); final IMenuManager tableMenu = new MenuManager(JSFUIPlugin.getResourceString("ElementEdit.Submenu.PanelGrid"));//$NON-NLS-1$ - tableMenu.add(action); + tableMenu.add(EMPTY_ACTION); // ok, we passed the checking, now let's create the actions. tableMenu.addMenuListener(new IMenuListener() @@ -257,11 +255,8 @@ public class PanelGridElementEdit extends DefaultJSFHTMLElementEdit int index = tableInsertRequest.getIndex() + (tableInsertRequest.isBefore() ? 0 : 1); return new PanelGridInsertRowCommand(viewer, panelGrid, index); } - else - { - int index = tableInsertRequest.getIndex() + (tableInsertRequest.isBefore() ? 0 : 1); - return new PanelGridInsertColumnCommand(viewer, panelGrid, index); - } + int index = tableInsertRequest.getIndex() + (tableInsertRequest.isBefore() ? 0 : 1); + return new PanelGridInsertColumnCommand(viewer, panelGrid, index); } else if (request instanceof InsertHeaderFooterRequest) { @@ -271,10 +266,7 @@ public class PanelGridElementEdit extends DefaultJSFHTMLElementEdit { return new PanelGridInsertHeaderCommand(viewer, panelGrid); } - else - { - return new PanelGridInsertFooterCommand(viewer, panelGrid); - } + return new PanelGridInsertFooterCommand(viewer, panelGrid); } else if (request instanceof DeleteHeaderFooterRequest) { @@ -289,10 +281,7 @@ public class PanelGridElementEdit extends DefaultJSFHTMLElementEdit { return new PanelGridDeleteRowCommand(viewer, panelGrid, deleteReq.getIndex()); } - else - { - return new PanelGridDeleteColumnCommand(viewer, panelGrid, deleteReq.getIndex()); - } + return new PanelGridDeleteColumnCommand(viewer, panelGrid, deleteReq.getIndex()); } return super.getCommand(request); } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/util/DataTableUtil.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/util/DataTableUtil.java index 6405515fb..369343224 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/util/DataTableUtil.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/util/DataTableUtil.java @@ -64,7 +64,7 @@ public class DataTableUtil } while (!IJSFConstants.TAG_DATATABLE.equalsIgnoreCase(childBackup.getParentNode().getLocalName())) { - childBackup = (Element) childBackup.getParentNode(); + childBackup = childBackup.getParentNode(); String tagName = childBackup.getLocalName(); if (IJSFConstants.TAG_COLUMN.equalsIgnoreCase(tagName)) { diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlActionListenerSection.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlActionListenerSection.java index 6cf27a596..e114270a1 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlActionListenerSection.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlActionListenerSection.java @@ -105,6 +105,7 @@ public class JSFHtmlActionListenerSection extends BaseCustomSection */ public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + // no support for viewer changes } public String getColumnText(Object element, int columnIndex) @@ -132,6 +133,7 @@ public class JSFHtmlActionListenerSection extends BaseCustomSection public void dispose() { + // nothing to dispose } /* (non-Javadoc) @@ -147,6 +149,7 @@ public class JSFHtmlActionListenerSection extends BaseCustomSection */ public void addListener(ILabelProviderListener listener) { + // TODO: listeners not supported? } /* (non-Javadoc) @@ -162,6 +165,7 @@ public class JSFHtmlActionListenerSection extends BaseCustomSection */ public void removeListener(ILabelProviderListener listener) { + // TODO: listeners not supported? } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlDataTableColumnsSection.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlDataTableColumnsSection.java index dc2f4a32c..b109a6511 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlDataTableColumnsSection.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlDataTableColumnsSection.java @@ -105,6 +105,7 @@ public class JSFHtmlDataTableColumnsSection extends BaseCustomSection */ public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + // no support for input changed } public String getColumnText(Object element, int columnIndex) @@ -131,6 +132,7 @@ public class JSFHtmlDataTableColumnsSection extends BaseCustomSection public void dispose() { + // nothing to dispose } /* (non-Javadoc) @@ -146,6 +148,7 @@ public class JSFHtmlDataTableColumnsSection extends BaseCustomSection */ public void addListener(ILabelProviderListener listener) { + // TODO: no support for listeners? } /* (non-Javadoc) @@ -161,6 +164,7 @@ public class JSFHtmlDataTableColumnsSection extends BaseCustomSection */ public void removeListener(ILabelProviderListener listener) { + // TODO: no support for listeners? } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlInputOthersSection.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlInputOthersSection.java index de7913d16..afd5f615c 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlInputOthersSection.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlInputOthersSection.java @@ -119,6 +119,7 @@ public class JSFHtmlInputOthersSection extends BaseCustomSection */ public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + // no support for input changed } public String getColumnText(Object element, int columnIndex) @@ -152,6 +153,7 @@ public class JSFHtmlInputOthersSection extends BaseCustomSection public void dispose() { + // nothing to dispose } /* (non-Javadoc) @@ -167,6 +169,7 @@ public class JSFHtmlInputOthersSection extends BaseCustomSection */ public void addListener(ILabelProviderListener listener) { + // TODO: no support for listeners? } /* (non-Javadoc) @@ -182,6 +185,7 @@ public class JSFHtmlInputOthersSection extends BaseCustomSection */ public void removeListener(ILabelProviderListener listener) { + // TODO: no support for listeners? } } @@ -299,6 +303,7 @@ public class JSFHtmlInputOthersSection extends BaseCustomSection */ public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + // do nothing } public String getColumnText(Object element, int columnIndex) @@ -326,6 +331,7 @@ public class JSFHtmlInputOthersSection extends BaseCustomSection public void dispose() { + // nothing to dispose } /* (non-Javadoc) @@ -341,6 +347,7 @@ public class JSFHtmlInputOthersSection extends BaseCustomSection */ public void addListener(ILabelProviderListener listener) { + // TODO: no support for listeners? } /* (non-Javadoc) @@ -356,6 +363,7 @@ public class JSFHtmlInputOthersSection extends BaseCustomSection */ public void removeListener(ILabelProviderListener listener) { + // TODO: no support for listeners? } } @@ -398,6 +406,7 @@ public class JSFHtmlInputOthersSection extends BaseCustomSection */ public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + // do nothing } public String getColumnText(Object element, int columnIndex) @@ -425,6 +434,7 @@ public class JSFHtmlInputOthersSection extends BaseCustomSection public void dispose() { + // nothing to dispose } /* (non-Javadoc) @@ -440,6 +450,7 @@ public class JSFHtmlInputOthersSection extends BaseCustomSection */ public void addListener(ILabelProviderListener listener) { + // TODO: no support for listeners? } /* (non-Javadoc) @@ -455,6 +466,7 @@ public class JSFHtmlInputOthersSection extends BaseCustomSection */ public void removeListener(ILabelProviderListener listener) { + // TODO: no support for listeners? } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlOutputFormatParamsSection.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlOutputFormatParamsSection.java index 9ca8168b8..8941a4114 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlOutputFormatParamsSection.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlOutputFormatParamsSection.java @@ -76,7 +76,6 @@ public class JSFHtmlOutputFormatParamsSection extends BaseCustomSection private class ParamCotentLabelProvider implements IStructuredContentProvider, ITableLabelProvider { - /* (non-Javadoc) * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object) */ @@ -113,6 +112,7 @@ public class JSFHtmlOutputFormatParamsSection extends BaseCustomSection */ public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + // do nothing } public String getColumnText(Object element, int columnIndex) @@ -142,6 +142,7 @@ public class JSFHtmlOutputFormatParamsSection extends BaseCustomSection public void dispose() { + // nothing to dispose } /* (non-Javadoc) @@ -157,6 +158,7 @@ public class JSFHtmlOutputFormatParamsSection extends BaseCustomSection */ public void addListener(ILabelProviderListener listener) { + // TODO: no support for listeners? } /* (non-Javadoc) @@ -172,6 +174,7 @@ public class JSFHtmlOutputFormatParamsSection extends BaseCustomSection */ public void removeListener(ILabelProviderListener listener) { + // TODO: no support for listeners? } } @@ -235,7 +238,7 @@ public class JSFHtmlOutputFormatParamsSection extends BaseCustomSection break; } _paramViewer.setInput(_element); - updateParamButtonStatus(); + // TODO: does nothing updateParamButtonStatus(); } } @@ -317,7 +320,7 @@ public class JSFHtmlOutputFormatParamsSection extends BaseCustomSection { public void selectionChanged(SelectionChangedEvent event) { - updateParamButtonStatus(); +// TODO: does nothing updateParamButtonStatus(); } } ); @@ -337,7 +340,7 @@ public class JSFHtmlOutputFormatParamsSection extends BaseCustomSection IJMTConstants.URI_JSF_CORE, attributes); c.execute(); _paramViewer.refresh(); - updateParamButtonStatus(); +// TODO: does nothing updateParamButtonStatus(); } } ); @@ -359,23 +362,24 @@ public class JSFHtmlOutputFormatParamsSection extends BaseCustomSection c.execute(); } _paramViewer.refresh(); - updateParamButtonStatus(); +// TODO: does nothing updateParamButtonStatus(); } } } ); } - private void updateParamButtonStatus() - { - } + // TODO: does nothing +// private void updateParamButtonStatus() +// { +// } public void setInput(IWorkbenchPart part, ISelection selection) { super.setInput(part, selection); _paramViewer.setInput(_element); - updateParamButtonStatus(); +// TODO: does nothing updateParamButtonStatus(); } private List getColumnNames() diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlOutputTextConverterSection.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlOutputTextConverterSection.java index c0aae3411..717b6e71c 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlOutputTextConverterSection.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlOutputTextConverterSection.java @@ -106,6 +106,7 @@ public class JSFHtmlOutputTextConverterSection extends BaseCustomSection */ public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + // do nothing } public String getColumnText(Object element, int columnIndex) @@ -133,6 +134,7 @@ public class JSFHtmlOutputTextConverterSection extends BaseCustomSection public void dispose() { + // nothing to dispose } /* (non-Javadoc) @@ -148,6 +150,7 @@ public class JSFHtmlOutputTextConverterSection extends BaseCustomSection */ public void addListener(ILabelProviderListener listener) { + // TODO: no support for listeners? } /* (non-Javadoc) @@ -163,6 +166,7 @@ public class JSFHtmlOutputTextConverterSection extends BaseCustomSection */ public void removeListener(ILabelProviderListener listener) { + // TODO: no support for listeners? } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlSelectChoicesSection.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlSelectChoicesSection.java index 9980e7a77..134c502b9 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlSelectChoicesSection.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlSelectChoicesSection.java @@ -104,6 +104,7 @@ public class JSFHtmlSelectChoicesSection extends BaseCustomSection */ public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + // do nothing } public String getColumnText(Object element, int columnIndex) @@ -131,6 +132,7 @@ public class JSFHtmlSelectChoicesSection extends BaseCustomSection public void dispose() { + // do nothing } /* (non-Javadoc) @@ -146,6 +148,7 @@ public class JSFHtmlSelectChoicesSection extends BaseCustomSection */ public void addListener(ILabelProviderListener listener) { + // TODO: no support for listeners? } /* (non-Javadoc) @@ -161,6 +164,7 @@ public class JSFHtmlSelectChoicesSection extends BaseCustomSection */ public void removeListener(ILabelProviderListener listener) { + // TODO: no support for listeners? } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/SectionResources.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/SectionResources.java index 346e4d9f6..5e8860d32 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/SectionResources.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/SectionResources.java @@ -19,7 +19,7 @@ import java.util.ResourceBundle; * @author mengbo * @version 1.5 */ -public class SectionResources +public final class SectionResources { private static final String BUNDLE_NAME = "org.eclipse.jst.pagedesigner.jsf.ui.sections.SectionResources"; //$NON-NLS-1$ @@ -27,6 +27,7 @@ public class SectionResources private SectionResources() { + // no external instantiation } public static String getString(String key) diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/el/ELParser.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/el/ELParser.java index 7820ac9f9..2fe08900b 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/el/ELParser.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/el/ELParser.java @@ -50,7 +50,7 @@ public class ELParser { .getSuffixes()); } else if (parsedExpression instanceof NamedValue) { _expressionList = new ArrayList(); - _expressionList.add((NamedValue) parsedExpression); + _expressionList.add(parsedExpression); } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/internal/pagevar/PageVariableAdapter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/internal/pagevar/PageVariableAdapter.java index 725e81752..25cd488bd 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/internal/pagevar/PageVariableAdapter.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/internal/pagevar/PageVariableAdapter.java @@ -153,10 +153,9 @@ public class PageVariableAdapter implements IPageVariableAdapter { IVariableInfo info = getVariableInfo(element); if (info == null) { return Collections.EMPTY_LIST; - } else { - List ret = new ArrayList(1); - ret.add(info); - return ret; } + List ret = new ArrayList(1); + ret.add(info); + return ret; } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/internal/pagevar/PageVariableAdatperRegistry.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/internal/pagevar/PageVariableAdatperRegistry.java index 54339785e..20a710a85 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/internal/pagevar/PageVariableAdatperRegistry.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/internal/pagevar/PageVariableAdatperRegistry.java @@ -194,21 +194,17 @@ public class PageVariableAdatperRegistry { if (target instanceof IDOMElement) { IDOMElement xmlEle = (IDOMElement) target; CMElementDeclaration decl = CMUtil.getElementDeclaration(xmlEle); - if (decl == null) { - return null; - } else if (CMUtil.isJSP(decl)) { - return getJSPTagVarDescriptor(xmlEle.getLocalName()); - } else { - String uri = CMUtil.getTagURI(decl); - if (uri != null) { - return getTagVarDescriptor(uri, xmlEle.getLocalName()); - } else { - return null; - } + if (decl != null) { + if (CMUtil.isJSP(decl)) { + return getJSPTagVarDescriptor(xmlEle.getLocalName()); + } + String uri = CMUtil.getTagURI(decl); + if (uri != null) { + return getTagVarDescriptor(uri, xmlEle.getLocalName()); + } } - } else { - return null; } + return null; } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/internal/pagevar/VariableInfo.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/internal/pagevar/VariableInfo.java index fb8a5e002..4424136ee 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/internal/pagevar/VariableInfo.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/internal/pagevar/VariableInfo.java @@ -65,6 +65,7 @@ public class VariableInfo implements IVariableInfo { * * @see java.lang.Object#equals(java.lang.Object) */ + // TODO: no hashcode override? public boolean equals(Object obj) { if (this == obj) { return true; @@ -73,16 +74,14 @@ public class VariableInfo implements IVariableInfo { VariableInfo info = (VariableInfo) obj; return this._mode == info._mode && equals(this._name, info._name) && equals(this._typeInfo, info._typeInfo); - } else { - return false; } + return false; } private boolean equals(String s1, String s2) { if (s1 == null) { return s2 == null; - } else { - return s1.equals(s2); } + return s1.equals(s2); } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/pagevar/adapter/IDocumentPageVariableAdapter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/pagevar/adapter/IDocumentPageVariableAdapter.java index 1fdc27723..31979ef9b 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/pagevar/adapter/IDocumentPageVariableAdapter.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/pagevar/adapter/IDocumentPageVariableAdapter.java @@ -22,5 +22,5 @@ import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter; */ public interface IDocumentPageVariableAdapter extends IPageVariablesProvider, INodeAdapter { - + // TODO: what's this for? } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/pagevar/adapter/PageVariableAdapterFactory.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/pagevar/adapter/PageVariableAdapterFactory.java index e5c5613ec..1c6c64d7c 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/pagevar/adapter/PageVariableAdapterFactory.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/pagevar/adapter/PageVariableAdapterFactory.java @@ -36,8 +36,7 @@ public class PageVariableAdapterFactory extends AbstractAdapterFactory { protected INodeAdapter createAdapter(INodeNotifier target) { if (target instanceof IDOMElement) { return PageVariableAdapter.getInstance(); - } else { - return null; } + return null; } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/util/CMUtil.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/util/CMUtil.java index a913467f2..9fcae7975 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/util/CMUtil.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/util/CMUtil.java @@ -76,9 +76,8 @@ public class CMUtil { } if (decl instanceof TLDElementDeclaration) { return (TLDElementDeclaration) decl; - } else { - return null; } + return null; } /** diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/META-INF/MANIFEST.MF b/jsf/plugins/org.eclipse.jst.pagedesigner/META-INF/MANIFEST.MF index 1232b2681..edd7c36de 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/META-INF/MANIFEST.MF +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/META-INF/MANIFEST.MF @@ -13,13 +13,11 @@ Require-Bundle: org.eclipse.core.runtime;visibility:=reexport, org.eclipse.jface.text;visibility:=reexport, org.eclipse.ui.workbench.texteditor, org.eclipse.wst.common.ui, - org.eclipse.wst.html.ui, org.eclipse.wst.sse.core;visibility:=reexport, org.eclipse.wst.css.core;visibility:=reexport, org.eclipse.wst.html.core;visibility:=reexport, org.eclipse.wst.xml.core;visibility:=reexport, org.eclipse.wst.common.uriresolver;visibility:=reexport, - org.eclipse.wst.common.ui.properties;visibility:=reexport, org.eclipse.wst.sse.ui;visibility:=reexport, org.eclipse.wst.xml.ui, org.eclipse.jst.j2ee, @@ -27,7 +25,9 @@ Require-Bundle: org.eclipse.core.runtime;visibility:=reexport, org.eclipse.jst.jsp.ui, org.eclipse.jst.j2ee.web, org.eclipse.jst.pagedesigner.jsp.core, - org.eclipse.jst.pagedesigner.common;visibility:=reexport + org.eclipse.jst.pagedesigner.common;visibility:=reexport, + org.eclipse.wst.html.ui, + org.eclipse.wst.common.ui.properties Eclipse-LazyStart: true Provide-Package: org.eclipse.jst.pagedesigner, org.eclipse.jst.pagedesigner.actions.container, diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/build.properties b/jsf/plugins/org.eclipse.jst.pagedesigner/build.properties index 9297c2d89..20b56796c 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/build.properties +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/build.properties @@ -5,7 +5,6 @@ bin.includes = pagedesigner.jar,\ META-INF/,\ configs/,\ icons/,\ - jsf-tld/,\ plugin.properties,\ plugin.xml,\ schema/ diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/plugin.xml b/jsf/plugins/org.eclipse.jst.pagedesigner/plugin.xml index 13be36f31..740b26383 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/plugin.xml +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/plugin.xml @@ -24,7 +24,7 @@ <factory class="org.eclipse.jst.pagedesigner.utils.UriAdapterFactory" adaptableType="org.eclipse.core.resources.IProject"> - <adapter type="org.eclipse.wst.sse.core.util.URIResolver" /> + <adapter type="org.eclipse.wst.sse.core.internal.util.URIResolver" /> </factory> <factory class="org.eclipse.jst.pagedesigner.dnd.internal.TextEditorDropTargetListenerFactory" diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/PDPlugin.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/PDPlugin.java index 80af43832..4d13e5fe7 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/PDPlugin.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/PDPlugin.java @@ -26,6 +26,7 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IWorkspace; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Platform; @@ -44,8 +45,8 @@ import org.eclipse.ui.IFileEditorInput; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.eclipse.wst.sse.core.StructuredModelManager; import org.eclipse.wst.sse.core.internal.provisional.IModelManager; -import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager; import org.osgi.framework.BundleContext; /** @@ -54,7 +55,7 @@ import org.osgi.framework.BundleContext; public class PDPlugin extends AbstractUIPlugin { private static final String ICONS_LIB_PATH = "icons"; - private static final boolean ROOT_PLUGIN = false; + //private static final boolean ROOT_PLUGIN = false; // The shared instance. private static PDPlugin _plugin; @@ -252,7 +253,7 @@ public class PDPlugin extends AbstractUIPlugin { } ImageRegistry images = getImageRegistry(); - Image image = (Image) images.get(name); + Image image = images.get(name); if (image == null) { try { ImageDescriptor id = ImageDescriptor.createFromURL(new URL( @@ -286,7 +287,7 @@ public class PDPlugin extends AbstractUIPlugin { } ImageRegistry images = getImageRegistry(); - ImageDescriptor id = (ImageDescriptor) images.getDescriptor(name); + ImageDescriptor id = images.getDescriptor(name); if (id == null) { try { id = ImageDescriptor.createFromURL(new URL(_pluginBase, @@ -317,7 +318,7 @@ public class PDPlugin extends AbstractUIPlugin { public static Path getInstallLocation() { try { URL url = getDefault().getBundle().getEntry("/"); - String s1 = Platform.resolve(url).getFile(); + String s1 = FileLocator.resolve(url).getFile(); if (s1.startsWith("/")) //$NON-NLS-1$ { s1 = s1.substring(1); @@ -355,9 +356,8 @@ public class PDPlugin extends AbstractUIPlugin { public static IWorkbenchWindow getActiveWorkbenchWindow() { if (getDefault().getWorkbench() == null) { return null; - } else { - return getDefault().getWorkbench().getActiveWorkbenchWindow(); } + return getDefault().getWorkbench().getActiveWorkbenchWindow(); } /** @@ -413,9 +413,8 @@ public class PDPlugin extends AbstractUIPlugin { Shell shell = getActiveWorkbenchShell(); if (shell != null) { return shell.getDisplay(); - } else { - return Display.getDefault(); } + return Display.getDefault(); } /** diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/container/ContainerActionGroup.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/container/ContainerActionGroup.java index 24b84e40e..807cad294 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/container/ContainerActionGroup.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/container/ContainerActionGroup.java @@ -88,12 +88,10 @@ public class ContainerActionGroup extends ActionGroup { if (position.getOffset() == 0 || position.getContainerNode() instanceof Text) { return position.getContainerPart(); - } else { - return position.getSiblingEditPart(false); } - } else { - return RangeUtil.findCommonAncestor(range); + return position.getSiblingEditPart(false); } + return RangeUtil.findCommonAncestor(range); } else { return null; } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/menuextension/RunAction.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/menuextension/RunAction.java index b729e76cb..d97d3395c 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/menuextension/RunAction.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/menuextension/RunAction.java @@ -101,10 +101,9 @@ public class RunAction extends Action { if (iconPath != null) { return AbstractUIPlugin.imageDescriptorFromPlugin( actions[j].getDeclaringExtension() - .getNamespace(), iconPath); - } else { - return null; + .getContributor().getName(), iconPath); } + return null; } } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/range/DesignerToolBarAction.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/range/DesignerToolBarAction.java index 084071aaa..2e506a446 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/range/DesignerToolBarAction.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/range/DesignerToolBarAction.java @@ -102,16 +102,16 @@ public abstract class DesignerToolBarAction extends Action implements IUpdate, public void setViewer(IHTMLGraphicalViewer viewer) { if (viewer == _viewer) { return; - } else { - if (_viewer != null) { - _viewer.removeSelectionChangedListener(this); - } - _viewer = viewer; - if (_viewer != null) { - _viewer.addSelectionChangedListener(this); - } - update(); } + + if (_viewer != null) { + _viewer.removeSelectionChangedListener(this); + } + _viewer = viewer; + if (_viewer != null) { + _viewer.addSelectionChangedListener(this); + } + update(); } /* diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/range/InsertTagChangeStyleAction.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/range/InsertTagChangeStyleAction.java index e9fdd8e1a..fd036257b 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/range/InsertTagChangeStyleAction.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/range/InsertTagChangeStyleAction.java @@ -104,12 +104,10 @@ public class InsertTagChangeStyleAction extends ChangeStyleAction { || EditModelQuery.hasAncestor(common, getExpectedTag(), true)) { return false; - } else { - return true; } - } else { - return false; + return true; } + return false; } protected boolean supportSingle() { diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/range/NoneParagraphStyleAction.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/range/NoneParagraphStyleAction.java index 101504894..58185e785 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/range/NoneParagraphStyleAction.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/range/NoneParagraphStyleAction.java @@ -76,12 +76,10 @@ public class NoneParagraphStyleAction extends ParagraphStyleAction { // the lowest common block parent is the container to apply style. if (EditModelQuery.hasAncestor(common, _applyingTags, true)) { return false; - } else { - return true; } - } else { - return false; + return true; } + return false; } /* diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/range/NoneStyleAction.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/range/NoneStyleAction.java index 86ac0cc1d..ce5e97e2b 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/range/NoneStyleAction.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/range/NoneStyleAction.java @@ -48,12 +48,10 @@ public class NoneStyleAction extends ChangeStyleAction { common = EditModelQuery.getInstance().getCommonAncestor(start, end); if (EditModelQuery.hasAncestor(common, _applyingStyleTags, true)) { return false; - } else { - return true; } - } else { - return false; + return true; } + return false; } /* diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/range/ParagraphStyleAction.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/range/ParagraphStyleAction.java index ea8a66339..e244aca52 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/range/ParagraphStyleAction.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/range/ParagraphStyleAction.java @@ -20,7 +20,6 @@ import org.eclipse.jst.pagedesigner.commands.range.ParagraphFinder; import org.eclipse.jst.pagedesigner.dom.DOMRange; import org.eclipse.jst.pagedesigner.dom.EditModelQuery; import org.eclipse.jst.pagedesigner.dom.IDOMPosition; -import org.eclipse.jst.pagedesigner.viewer.IHTMLGraphicalViewer; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -77,12 +76,10 @@ public class ParagraphStyleAction extends DesignerToolBarAction { // the lowest common block parent is the container to apply style. if (containsTag(common)) { return true; - } else { - return false; } - } else { - return false; + return false; } + return false; } protected boolean containsTag(Node common) { @@ -92,23 +89,19 @@ public class ParagraphStyleAction extends DesignerToolBarAction { && getExpectedTag().equalsIgnoreCase( common.getNodeName().toLowerCase()); } - // return false; - else { - String align = ((Element) _applyingNode).getAttribute("align"); - if (!(common instanceof Element)) { - return false; - } - String cAlign = ((Element) common).getAttribute("align"); - if (align == null || cAlign == null) { - return false; - } - if (align.equals(cAlign)) { - return true; - } else { - return false; - } - } - + + String align = ((Element) _applyingNode).getAttribute("align"); + if (!(common instanceof Element)) { + return false; + } + String cAlign = ((Element) common).getAttribute("align"); + if (align == null || cAlign == null) { + return false; + } + if (align.equals(cAlign)) { + return true; + } + return false; } /** @@ -117,9 +110,8 @@ public class ParagraphStyleAction extends DesignerToolBarAction { public String getExpectedTag() { if (_tagName == null) { return _applyingNode.getNodeName().toLowerCase(); - } else { - return _tagName.toLowerCase(); } + return _tagName.toLowerCase(); } /** @@ -128,9 +120,8 @@ public class ParagraphStyleAction extends DesignerToolBarAction { public Element getApplyingNode() { if (_applyingNode != null) { return (Element) _applyingNode; - } else { - return null; } + return null; } /* @@ -149,24 +140,4 @@ public class ParagraphStyleAction extends DesignerToolBarAction { } return command; } - - /* - * (non-Javadoc) - * - * @see org.eclipse.jst.pagedesigner.commands.range.DesignerToolBarAction#setViewer(org.eclipse.jst.pagedesigner.viewer.IHTMLGraphicalViewer) - */ - public void setViewer(IHTMLGraphicalViewer viewer) { - // TODO Auto-generated method stub - super.setViewer(viewer); - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.ui.texteditor.IUpdate#update() - */ - public void update() { - // TODO Auto-generated method stub - super.update(); - } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/range/RangeActionGroup.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/range/RangeActionGroup.java index cdb67adad..a1c61c40e 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/range/RangeActionGroup.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/range/RangeActionGroup.java @@ -32,7 +32,10 @@ import org.w3c.dom.Element; * @version 1.5 */ public class RangeActionGroup extends ActionGroup { - public static Action action = new Action() { + // TODO: what is this? a separator? + private static final Action action = new Action() { + // Action is abstract but has no abstract methods + // so create a default empty action that does nothing }; /** @@ -60,9 +63,11 @@ public class RangeActionGroup extends ActionGroup { addTextStyleMenu(menu, (IHTMLGraphicalViewer) getContext() .getInput()); } - addListModeMenu(menu, selection); + // TODO: the (commented out) copy of this method does nothing + //addListModeMenu(menu, selection); - addTextFontMenu(menu, selection); + // TODO: the (commented out) copy of this method does nothing + //addTextFontMenu(menu, selection); addLinkMenu(menu, selection); } @@ -74,14 +79,13 @@ public class RangeActionGroup extends ActionGroup { private DesignRange fixUpSelection(ISelection selection) { if (selection instanceof DesignRange) { return (DesignRange) selection; - } else { - return null; } + return null; } private void addLinkMenu(IMenuManager menu, final DesignRange selection) { - Action action = new MakeLinkAction(selection); - menu.appendToGroup(PageDesignerActionConstants.GROUP_STYLE, action); + Action action1 = new MakeLinkAction(selection); + menu.appendToGroup(PageDesignerActionConstants.GROUP_STYLE, action1); } private void addTextStyleMenu(IMenuManager menu, @@ -93,31 +97,31 @@ public class RangeActionGroup extends ActionGroup { submenu.setRemoveAllWhenShown(true); submenu.addMenuListener(new IMenuListener() { public void menuAboutToShow(IMenuManager manager) { - DesignerToolBarAction action = null; - action = DesignActionBarFactory.getInstance().getStyleAction( + DesignerToolBarAction action1 = null; + action1 = DesignActionBarFactory.getInstance().getStyleAction( IHTMLConstants.TAG_U); - action.setViewer(viewer); - submenu.add(action); + action1.setViewer(viewer); + submenu.add(action1); - action = DesignActionBarFactory.getInstance().getStyleAction( + action1 = DesignActionBarFactory.getInstance().getStyleAction( IHTMLConstants.TAG_B); - action.setViewer(viewer); - submenu.add(action); + action1.setViewer(viewer); + submenu.add(action1); - action = DesignActionBarFactory.getInstance().getStyleAction( + action1 = DesignActionBarFactory.getInstance().getStyleAction( IHTMLConstants.TAG_I); - action.setViewer(viewer); - submenu.add(action); + action1.setViewer(viewer); + submenu.add(action1); - action = DesignActionBarFactory.getInstance().getStyleAction( + action1 = DesignActionBarFactory.getInstance().getStyleAction( IHTMLConstants.TAG_SMALL); - action.setViewer(viewer); - submenu.add(action); + action1.setViewer(viewer); + submenu.add(action1); - action = DesignActionBarFactory.getInstance().getStyleAction( + action1 = DesignActionBarFactory.getInstance().getStyleAction( IHTMLConstants.TAG_BIG); - action.setViewer(viewer); - submenu.add(action); + action1.setViewer(viewer); + submenu.add(action1); } }); @@ -128,9 +132,9 @@ public class RangeActionGroup extends ActionGroup { * @param menu * @param selection */ - private void addTextFontMenu(IMenuManager menu, DesignRange selection) { - - } +// private void addTextFontMenu(IMenuManager menu, DesignRange selection) { +// // +// } /** * @param menu @@ -167,8 +171,8 @@ public class RangeActionGroup extends ActionGroup { * @param menu * @param selection */ - private void addListModeMenu(IMenuManager menu, DesignRange selection) { - } +// private void addListModeMenu(IMenuManager menu, DesignRange selection) { +// } /** * @param menu diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/single/SingleElementActionGroup.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/single/SingleElementActionGroup.java index e84c19696..d305fd3b5 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/single/SingleElementActionGroup.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/single/SingleElementActionGroup.java @@ -31,7 +31,11 @@ import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; * @version 1.5 */ public class SingleElementActionGroup extends ActionGroup { - public static Action action = new Action() { + // TODO: why? + private static final Action action = new Action() { + // create a default instance that does nothing + // Action is abstract but has no abstract methods + // run() on this object is a NOOP }; /* diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/single/StyleClassSupport.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/single/StyleClassSupport.java index 4b43d767f..a9d88d554 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/single/StyleClassSupport.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/single/StyleClassSupport.java @@ -76,9 +76,8 @@ public class StyleClassSupport { String styleClassAttr = getStyleClassAttributeName(ele); if (styleClassAttr != null) { return ele.getAttribute(styleClassAttr); - } else { - return null; } + return null; } /** @@ -98,9 +97,8 @@ public class StyleClassSupport { if (taguri == null || IJMTConstants.URI_HTML.equals(taguri)) { if (decl.getAttributes().getNamedItem("class") != null) { return "class"; - } else { - return null; } + return null; } else if (decl.getAttributes().getNamedItem("styleClass") != null) { return "styleClass"; } else if (decl.getAttributes().getNamedItem("class") != null) { diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/table/TableActionGroup.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/table/TableActionGroup.java index c5192bd12..ebbcc2b01 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/table/TableActionGroup.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/table/TableActionGroup.java @@ -37,7 +37,9 @@ import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; * @version 1.5 */ public class TableActionGroup extends ActionGroup { - public static Action action = new Action() { + // TODO: I think there's a pattern emerging... + private final static Action action = new Action() { + // create an empty no-op }; /* @@ -92,10 +94,10 @@ public class TableActionGroup extends ActionGroup { */ private void fillTableMenu(ElementEditPart tablePart, int cellRow, int cellColumn, IMenuManager tableMenu) { - SelectEditPartAction action = new SelectEditPartAction( + SelectEditPartAction action1 = new SelectEditPartAction( PDPlugin .getResourceString("TableActionGroup.Submenu.SelectTable"), tablePart);//$NON-NLS-1$ - tableMenu.add(action); + tableMenu.add(action1); tableMenu.add(new Separator()); @@ -151,7 +153,8 @@ public class TableActionGroup extends ActionGroup { * @return */ private boolean supportTableActions(ElementEditPart tablePart) { - // TODO Auto-generated method stub + // TODO: what's the point of this method? + // it's only used in one place and always resolves to the same value.. return true; } @@ -181,12 +184,10 @@ public class TableActionGroup extends ActionGroup { DesignPosition position = range.getStartPosition(); if (position.getOffset() == 0) { return position.getContainerPart(); - } else { - return position.getSiblingEditPart(true); } - } else { - return RangeUtil.findCommonAncestor(range); + return position.getSiblingEditPart(true); } + return RangeUtil.findCommonAncestor(range); } else { return null; } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/table/TableOperationContext.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/table/TableOperationContext.java index 22e254972..6f4819270 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/table/TableOperationContext.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/table/TableOperationContext.java @@ -38,7 +38,7 @@ public class TableOperationContext { CSSTableLayout2 tableLayout = null; while (part.getParent() instanceof ElementEditPart) { - part = (ElementEditPart) part.getParent(); + part = part.getParent(); IFigure figure = ((GraphicalEditPart) part).getFigure(); if (figure.getLayoutManager() instanceof CSSTableLayout2) { @@ -63,16 +63,14 @@ public class TableOperationContext { TableCellInfo cellInfo = cellLayout.getTableCellInfo(); if (cellInfo == null) { return null; - } else { - TableOperationContext context = new TableOperationContext(); - context._tablePart = tablePart; - context._rowIndex = cellInfo.getRowIndex(); - context._columnIndex = cellInfo.getColumnIndex(); - return context; } - } else { - return null; + TableOperationContext context = new TableOperationContext(); + context._tablePart = tablePart; + context._rowIndex = cellInfo.getRowIndex(); + context._columnIndex = cellInfo.getColumnIndex(); + return context; } + return null; } figure = figure.getParent(); } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/adapters/internal/BodyInfo.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/adapters/internal/BodyInfo.java index df446edd0..8a6b9e4f3 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/adapters/internal/BodyInfo.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/adapters/internal/BodyInfo.java @@ -17,7 +17,6 @@ import org.eclipse.jst.pagedesigner.IJSFConstants; import org.eclipse.jst.pagedesigner.adapters.IBodyInfo; import org.eclipse.jst.pagedesigner.jsp.core.IJSPCoreConstants; import org.eclipse.jst.pagedesigner.utils.CMUtil; -import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -137,9 +136,10 @@ public class BodyInfo implements IBodyInfo { * @see org.eclipse.wst.sse.core.internal.provisional.INodeAdapter#notifyChanged(org.eclipse.wst.sse.core.internal.provisional.INodeNotifier, * int, java.lang.Object, java.lang.Object, java.lang.Object, int) */ - public void notifyChanged(INodeNotifier notifier, int eventType, - Object changedFeature, Object oldValue, Object newValue, int pos) { - } + // TODO: dead code? +// public void notifyChanged(INodeNotifier notifier, int eventType, +// Object changedFeature, Object oldValue, Object newValue, int pos) { +// } /** * @return diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/CommandResources.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/CommandResources.java index 77e548964..97bf4cea4 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/CommandResources.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/CommandResources.java @@ -25,10 +25,10 @@ public class CommandResources { .getBundle(BUNDLE_NAME); private CommandResources() { + // no local instantiation } public static String getString(String key) { - // TODO Auto-generated method stub try { return RESOURCE_BUNDLE.getString(key); } catch (MissingResourceException e) { diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/DeleteNodeCommand.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/DeleteNodeCommand.java index 3e475914e..f583aec1e 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/DeleteNodeCommand.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/DeleteNodeCommand.java @@ -110,8 +110,7 @@ public class DeleteNodeCommand extends DesignerCommand { protected ISelection getAfterCommandDesignerSelection() { if (_prevRange.isValid()) { return _prevRange; - } else { - return null; } + return null; } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/DesignResizeComponentCommand.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/DesignResizeComponentCommand.java index 08cc1af56..0d1361ebf 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/DesignResizeComponentCommand.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/DesignResizeComponentCommand.java @@ -39,6 +39,8 @@ public class DesignResizeComponentCommand extends Command { this._constraint = constraint; EditPart part = child; if (part instanceof ScalableRootEditPart) { + // TODO: eh? + // do nothing I guess... } else { while (part != null && !(part.getParent() instanceof ScalableRootEditPart)) { @@ -120,9 +122,8 @@ public class DesignResizeComponentCommand extends Command { } if (result.indexOf(item) >= 0) { return removeOthers(result, item); - } else { - return result; } + return result; } /* diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/DesignerCommand.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/DesignerCommand.java index a05b785a0..8bf386367 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/DesignerCommand.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/DesignerCommand.java @@ -172,6 +172,7 @@ public abstract class DesignerCommand extends Command { * child class can override this method for any pre action. */ protected void preExecute() { + // does nothing; children may wish to implement } /** @@ -185,6 +186,7 @@ public abstract class DesignerCommand extends Command { * called. */ protected void postExecute() { + // does nothing; child may wish to implement } /** @@ -246,11 +248,10 @@ public abstract class DesignerCommand extends Command { DesignPosition start = DOMPositionHelper.toDesignPosition(startPos); if (range.isEmpty()) { return new DesignRange(start, start); - } else { - IDOMPosition endPos = range.getEndPosition(); - return new DesignRange(start, DOMPositionHelper - .toDesignPosition(endPos)); } + IDOMPosition endPos = range.getEndPosition(); + return new DesignRange(start, DOMPositionHelper + .toDesignPosition(endPos)); } catch (Exception e) { // "Selection error" _log.error("Error.RangeModeCommand.SetSelection"); //$NON-NLS-1$ diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/nav/ICaretPositionMover.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/nav/ICaretPositionMover.java index 2b8549085..ca75659d5 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/nav/ICaretPositionMover.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/nav/ICaretPositionMover.java @@ -12,10 +12,12 @@ package org.eclipse.jst.pagedesigner.commands.nav; /** + * Tags commands that care about caret position + * TODO: does presently appear to have a purpose + * * @author mengbo * - * TODO To change the template for this generated type comment go to Window - - * Preferences - Java - Code Style - Code Templates */ public interface ICaretPositionMover { + // empty; tagging interface } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/nav/VerticalMoveCommand.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/nav/VerticalMoveCommand.java index d4f2f9882..f6109942e 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/nav/VerticalMoveCommand.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/nav/VerticalMoveCommand.java @@ -84,9 +84,9 @@ public class VerticalMoveCommand extends Command { moveMediator);// position.getContainerPart(); if (rootpart1 == null) { return; - } else { - point = adjustLocation(rootpart1, point); } + + point = adjustLocation(rootpart1, point); Rectangle bound = EditPartPositionHelper.getAbsoluteBounds(rootpart1); // get current according to the point. // FlowBoxLine line = @@ -176,9 +176,8 @@ public class VerticalMoveCommand extends Command { .convertToAbsoluteCaretRect(prevPos); if (_up) { return getYDistance(newRec, prevRec, _up) < 0; - } else { - return getYDistance(newRec, prevRec, _up) > 0; } + return getYDistance(newRec, prevRec, _up) > 0; } /** @@ -193,12 +192,10 @@ public class VerticalMoveCommand extends Command { private int getYDistance(Rectangle rec1, Rectangle rec2, boolean top) { if (rec1.getCopy().intersect(rec2).height > 0) { return 0; - } else { - if (top) { - return rec1.getTop().y - rec2.getTop().y; - } else { - return rec1.getBottom().y - rec2.getBottom().y; - } } + if (top) { + return rec1.getTop().y - rec2.getTop().y; + } + return rec1.getBottom().y - rec2.getBottom().y; } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/ApplyStyleCommand.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/ApplyStyleCommand.java index 43cc37117..4b84043e6 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/ApplyStyleCommand.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/ApplyStyleCommand.java @@ -11,9 +11,6 @@ *******************************************************************************/ package org.eclipse.jst.pagedesigner.commands.range; -import java.util.ArrayList; -import java.util.List; - import org.eclipse.jst.pagedesigner.IHTMLConstants; import org.eclipse.jst.pagedesigner.commands.CommandResources; import org.eclipse.jst.pagedesigner.dom.DOMRange; @@ -22,7 +19,6 @@ import org.eclipse.jst.pagedesigner.dom.DOMUtil; import org.eclipse.jst.pagedesigner.dom.EditModelQuery; import org.eclipse.jst.pagedesigner.dom.IDOMPosition; import org.eclipse.jst.pagedesigner.viewer.IHTMLGraphicalViewer; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMText; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.Text; @@ -93,47 +89,45 @@ public class ApplyStyleCommand extends RangeModeCommand { .getOffset()); return range; - } else { - - if (startContainer instanceof Text) { - // if the start offset is 0,then skip split the Text - if (start.getOffset() > 0) { - startContainer = ((Text) startContainer).splitText(start - .getOffset()); - start = new DOMRefPosition(startContainer, false); - } - } else { - startContainer = start.getNextSiblingNode(); - } - if (endContainer instanceof Text) { - if (end.getOffset() > 0) { - endContainer = ((Text) endContainer).splitText(end - .getOffset()); - endContainer = endContainer.getPreviousSibling(); - } else { - endContainer = endContainer.getPreviousSibling(); - } - } else { - endContainer = end.getPreviousSiblingNode(); - } - - for (Node node = startContainer; node != endContainer; node = EditModelQuery - .getInstance().getNextLeafNeighbor(node)) { - if (EditModelQuery.hasAncestor(node, getTag(), true)) { - continue; - } - Element newnode = createStyleElement(); - node.getParentNode().insertBefore(newnode, node); - newnode.appendChild(node); - } - if (!EditModelQuery.hasAncestor(endContainer, getTag(), true)) { - Element newnode = createStyleElement(); - endContainer.getParentNode() - .insertBefore(newnode, endContainer); - newnode.appendChild(endContainer); - } - } + + if (startContainer instanceof Text) { + // if the start offset is 0,then skip split the Text + if (start.getOffset() > 0) { + startContainer = ((Text) startContainer).splitText(start + .getOffset()); + start = new DOMRefPosition(startContainer, false); + } + } else { + startContainer = start.getNextSiblingNode(); + } + if (endContainer instanceof Text) { + if (end.getOffset() > 0) { + endContainer = ((Text) endContainer).splitText(end + .getOffset()); + endContainer = endContainer.getPreviousSibling(); + } else { + endContainer = endContainer.getPreviousSibling(); + } + } else { + endContainer = end.getPreviousSiblingNode(); + } + + for (Node node = startContainer; node != endContainer; node = EditModelQuery + .getInstance().getNextLeafNeighbor(node)) { + if (EditModelQuery.hasAncestor(node, getTag(), true)) { + continue; + } + Element newnode = createStyleElement(); + node.getParentNode().insertBefore(newnode, node); + newnode.appendChild(node); + } + if (!EditModelQuery.hasAncestor(endContainer, getTag(), true)) { + Element newnode = createStyleElement(); + endContainer.getParentNode() + .insertBefore(newnode, endContainer); + newnode.appendChild(endContainer); + } // merge the style tags @@ -209,93 +203,95 @@ public class ApplyStyleCommand extends RangeModeCommand { */ } - private DOMRange middleApply(Node ancester, IDOMPosition startPosition, - IDOMPosition endPosition) { - startPosition = skip(startPosition, true); - if (startPosition.getNextSiblingNode() == null - || startPosition.getOffset() >= endPosition.getOffset()) { - return null; - } else { - List needMove = new ArrayList(); - Node startNext = startPosition.getNextSiblingNode(); - Node endNext = endPosition.getNextSiblingNode(); - while (startNext != null && startNext != endNext) { - needMove.add(startNext); - startNext = startNext.getNextSibling(); - } - Element newEle = createStyleElement(); - ancester.insertBefore(newEle, startPosition.getNextSiblingNode()); - for (int i = 0, n = needMove.size(); i < n; i++) { - newEle.appendChild((Node) needMove.get(i)); - } - return new DOMRange(new DOMRefPosition(newEle, false), - new DOMRefPosition(newEle, true)); - } - - } - - private IDOMPosition partialApply(IDOMPosition position, Node ancester, - boolean forward, DOMRange[] result) { - IDOMPosition startRef = null, endRef = null; - - while (position != null && position.getContainerNode() != ancester) { - Node container = position.getContainerNode(); - if (container instanceof Text) { - // splitText will move the position up one level - position = splitText(position); - } else { - // skip those nodes that can't have the style applied. - position = skip(position, forward); - Node sibling = position.getSibling(forward); - if (sibling != null) { - List needMove = new ArrayList(); - while (sibling != null) { - needMove.add(sibling); - sibling = forward ? sibling.getNextSibling() : sibling - .getPreviousSibling(); - } - - // ok, there is nodes that need the style - Element newEle = createStyleElement(); - container.insertBefore(newEle, position - .getNextSiblingNode()); - for (int i = 0, size = needMove.size(); i < size; i++) { - newEle.appendChild((Node) needMove.get(i)); - } - if (startRef == null) { - startRef = new DOMRefPosition(newEle, !forward); - } - endRef = new DOMRefPosition(newEle, forward); - } - // move the position up one level - position = new DOMRefPosition(container, forward); - } - } - if (startRef == null) { - result[0] = null; - } else { - result[0] = forward ? new DOMRange(startRef, endRef) - : new DOMRange(endRef, startRef); - } - return position; - } + // TODO: unused code. Dead? +// private DOMRange middleApply(Node ancester, IDOMPosition startPosition, +// IDOMPosition endPosition) { +// startPosition = skip(startPosition, true); +// if (startPosition.getNextSiblingNode() == null +// || startPosition.getOffset() >= endPosition.getOffset()) { +// return null; +// } else { +// List needMove = new ArrayList(); +// Node startNext = startPosition.getNextSiblingNode(); +// Node endNext = endPosition.getNextSiblingNode(); +// while (startNext != null && startNext != endNext) { +// needMove.add(startNext); +// startNext = startNext.getNextSibling(); +// } +// Element newEle = createStyleElement(); +// ancester.insertBefore(newEle, startPosition.getNextSiblingNode()); +// for (int i = 0, n = needMove.size(); i < n; i++) { +// newEle.appendChild((Node) needMove.get(i)); +// } +// return new DOMRange(new DOMRefPosition(newEle, false), +// new DOMRefPosition(newEle, true)); +// } +// } + + // TODO: unused code. Dead? +// private IDOMPosition partialApply(IDOMPosition position, Node ancester, +// boolean forward, DOMRange[] result) { +// IDOMPosition startRef = null, endRef = null; +// +// while (position != null && position.getContainerNode() != ancester) { +// Node container = position.getContainerNode(); +// if (container instanceof Text) { +// // splitText will move the position up one level +// position = splitText(position); +// } else { +// // skip those nodes that can't have the style applied. +// position = skip(position, forward); +// Node sibling = position.getSibling(forward); +// if (sibling != null) { +// List needMove = new ArrayList(); +// while (sibling != null) { +// needMove.add(sibling); +// sibling = forward ? sibling.getNextSibling() : sibling +// .getPreviousSibling(); +// } +// +// // ok, there is nodes that need the style +// Element newEle = createStyleElement(); +// container.insertBefore(newEle, position +// .getNextSiblingNode()); +// for (int i = 0, size = needMove.size(); i < size; i++) { +// newEle.appendChild((Node) needMove.get(i)); +// } +// if (startRef == null) { +// startRef = new DOMRefPosition(newEle, !forward); +// } +// endRef = new DOMRefPosition(newEle, forward); +// } +// // move the position up one level +// position = new DOMRefPosition(container, forward); +// } +// } +// if (startRef == null) { +// result[0] = null; +// } else { +// result[0] = forward ? new DOMRange(startRef, endRef) +// : new DOMRange(endRef, startRef); +// } +// return position; +// } /** * @param position * @return */ - private IDOMPosition splitText(IDOMPosition position) { - Text text = (Text) position.getContainerNode(); - int offset = position.getOffset(); - if (offset <= 0) { - return new DOMRefPosition(text, false); - } else if (offset >= text.getData().length()) { - return new DOMRefPosition(text, true); - } else { - text.splitText(offset); - return new DOMRefPosition(text, true); - } - } + // TODO: dead? +// private IDOMPosition splitText(IDOMPosition position) { +// Text text = (Text) position.getContainerNode(); +// int offset = position.getOffset(); +// if (offset <= 0) { +// return new DOMRefPosition(text, false); +// } else if (offset >= text.getData().length()) { +// return new DOMRefPosition(text, true); +// } else { +// text.splitText(offset); +// return new DOMRefPosition(text, true); +// } +// } /** * @param start @@ -408,13 +404,12 @@ public class ApplyStyleCommand extends RangeModeCommand { protected Element createStyleElement() { if (_applyingNode != null) { return _applyingNode; - } else { - Element element = getModel().getDocument().createElement(getTag()); - if (_cssProperty != null && _cssPropertyValue != null) { - element.setAttribute(_cssProperty, _cssPropertyValue); - } - return element; } + Element element = getModel().getDocument().createElement(getTag()); + if (_cssProperty != null && _cssPropertyValue != null) { + element.setAttribute(_cssProperty, _cssPropertyValue); + } + return element; } /** @@ -422,30 +417,31 @@ public class ApplyStyleCommand extends RangeModeCommand { * @param b * @return */ - private IDOMPosition skip(IDOMPosition position, boolean forward) { - Node node = position.getSibling(forward); - - if (node == null) { - return position; - } - boolean canSkip = false; - if (node instanceof Text) { - canSkip = ((IDOMText) node).isElementContentWhitespace(); - } else if (node instanceof Element) { - if (getTag().equalsIgnoreCase(((Element) node).getTagName())) { - canSkip = true; - } else { - canSkip = false; - } - } else { - canSkip = true; - } - if (canSkip) { - return new DOMRefPosition(node, forward); - } else { - return position; - } - } + // TODO: dead? +// private IDOMPosition skip(IDOMPosition position, boolean forward) { +// Node node = position.getSibling(forward); +// +// if (node == null) { +// return position; +// } +// boolean canSkip = false; +// if (node instanceof Text) { +// canSkip = ((IDOMText) node).isElementContentWhitespace(); +// } else if (node instanceof Element) { +// if (getTag().equalsIgnoreCase(((Element) node).getTagName())) { +// canSkip = true; +// } else { +// canSkip = false; +// } +// } else { +// canSkip = true; +// } +// if (canSkip) { +// return new DOMRefPosition(node, forward); +// } else { +// return position; +// } +// } /** * @return Returns the _cssProperty. @@ -483,9 +479,8 @@ public class ApplyStyleCommand extends RangeModeCommand { public final String getTag() { if (_tag != null) { return _tag; - } else { - return _applyingNode.getNodeName(); } + return _applyingNode.getNodeName(); } /** @@ -495,8 +490,4 @@ public class ApplyStyleCommand extends RangeModeCommand { public final void setTag(String _tag) { this._tag = _tag; } - - private void updateStyleElement() { - - } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/ClipboardData.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/ClipboardData.java index f41c95c7e..5f0ce33db 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/ClipboardData.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/ClipboardData.java @@ -74,12 +74,10 @@ public class ClipboardData implements IInputSourceProvider { public Object getClipboardData() { Clipboard clipboard = new Clipboard(_control.getDisplay()); - Object cuted = clipboard.getContents(TemplateTransfer.getInstance()); + final Object cuted = clipboard.getContents(TemplateTransfer.getInstance()); if (cuted instanceof Node[] || cuted instanceof Vector) { return cuted; - } else { - cuted = clipboard.getContents(TextTransfer.getInstance()); - return cuted; } + return clipboard.getContents(TextTransfer.getInstance()); } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/ContentCommand.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/ContentCommand.java index c1a9cdbc4..3c6d759b4 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/ContentCommand.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/ContentCommand.java @@ -71,13 +71,12 @@ public class ContentCommand extends RangeModeCommand { + data.substring(offset); text.setData(newData); return new DOMPosition(text, offset + _content.length()); - } else { - // we need to create a text node. - Text text = getDocument().createTextNode(_content); - position.getContainerNode().insertBefore(text, - position.getNextSiblingNode()); - return new DOMRefPosition(text, true); } + // we need to create a text node. + Text text = getDocument().createTextNode(_content); + position.getContainerNode().insertBefore(text, + position.getNextSiblingNode()); + return new DOMRefPosition(text, true); } // protected DesignPosition doContent() diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/CopyEdit.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/CopyEdit.java index 8ae5e5ad2..8fba0105c 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/CopyEdit.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/CopyEdit.java @@ -20,6 +20,7 @@ import org.eclipse.jst.pagedesigner.common.logging.Logger; import org.eclipse.jst.pagedesigner.dom.DOMRange; import org.eclipse.jst.pagedesigner.dom.EditHelper; import org.eclipse.jst.pagedesigner.dom.EditModelQuery; +import org.w3c.dom.DOMException; import org.w3c.dom.Node; import org.w3c.dom.Text; @@ -107,15 +108,19 @@ public class CopyEdit extends DesignEdit { } if (start == end) { return null; - } else { - try { - String text = currentNode.getData().substring(start, end); - return EditModelQuery.getDocumentNode(currentNode) - .createTextNode(text); - } catch (Exception e) { - _log.error("Exception", e); - return null; - } } + + try { + String text = currentNode.getData().substring(start, end); + return EditModelQuery.getDocumentNode(currentNode) + .createTextNode(text); + } catch (DOMException e) { + // TODO: changed this from catching Exception + // DOMException is the only exception that + // anything in the try is threatening to throw + // and even that is Runtime + _log.error("Exception", e); + return null; + } } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/CutCommand.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/CutCommand.java index 6416ac582..8578b9d80 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/CutCommand.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/CutCommand.java @@ -37,13 +37,11 @@ public class CutCommand extends RangeModeCommand { DesignEdit edit = new CutEdit(selection, getViewer()); if (EditModelQuery.isSame(selection)) { return null; - } else { - if (edit.perform()) { - return new DOMRange(edit.getOperationPosition(), edit - .getOperationPosition()); - } else { - return selection; - } } + if (edit.perform()) { + return new DOMRange(edit.getOperationPosition(), edit + .getOperationPosition()); + } + return selection; } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/DeleteCommand.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/DeleteCommand.java index ef701210b..3aadf6404 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/DeleteCommand.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/DeleteCommand.java @@ -59,8 +59,7 @@ public class DeleteCommand extends RangeModeCommand implements if (status) { return new DOMRange(edit.getOperationPosition(), edit .getOperationPosition()); - } else { - return selection; } + return selection; } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/DeleteEdit.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/DeleteEdit.java index 47be5b7e2..421221b66 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/DeleteEdit.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/DeleteEdit.java @@ -93,10 +93,9 @@ public class DeleteEdit extends DesignEdit { } if (EditModelQuery.isSame(opPosition, getOperationPosition())) { return; - } else { - setRange(new DOMRange(opPosition, getOperationPosition())); - deleteRange(); } + setRange(new DOMRange(opPosition, getOperationPosition())); + deleteRange(); } protected Stack deleteRange() { @@ -277,9 +276,8 @@ public class DeleteEdit extends DesignEdit { second = position.getPreviousSiblingNode(); } return second != null ? (Text) EditHelper.deleteNode(second) : null; - } else { - setOperationPosition(new DOMRefPosition(currentNode, false)); - return (Text) EditHelper.deleteNode(currentNode); } + setOperationPosition(new DOMRefPosition(currentNode, false)); + return (Text) EditHelper.deleteNode(currentNode); } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/InsertEdit.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/InsertEdit.java index ff4ef2f48..7c9f4bac9 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/InsertEdit.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/InsertEdit.java @@ -18,13 +18,9 @@ import org.eclipse.jst.pagedesigner.dom.DOMPositionHelper; import org.eclipse.jst.pagedesigner.dom.DOMRange; import org.eclipse.jst.pagedesigner.dom.DOMRefPosition; import org.eclipse.jst.pagedesigner.dom.DOMUtil; -import org.eclipse.jst.pagedesigner.dom.EditHelper; import org.eclipse.jst.pagedesigner.dom.EditModelQuery; import org.eclipse.jst.pagedesigner.dom.IDOMPosition; import org.eclipse.jst.pagedesigner.jsp.core.IJSPCoreConstants; -import org.eclipse.jst.pagedesigner.validation.caret.ActionData; -import org.eclipse.jst.pagedesigner.validation.caret.InlineEditingNavigationMediator; -import org.eclipse.jst.pagedesigner.viewer.DesignRange; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; import org.w3c.dom.Node; import org.w3c.dom.Text; @@ -160,28 +156,29 @@ public class InsertEdit extends DeleteEdit { return true; } - private boolean splitNode() { - if ((getViewer()).getSelection() instanceof DesignRange - && _data.getCharacterData() != null - && _data.getCharacterData().charValue() == '\r') { - DesignRange range = (DesignRange) (getViewer()).getSelection(); - Node node = range.getStartPosition().getContainerNode(); - if (EditModelQuery.isText(node)) { - node = node.getParentNode(); - } - if (EditModelQuery.isListItem(node)) { - IDOMPosition position = DOMPositionHelper.toDOMPosition(range - .getStartPosition()); - // split text and it's parent. - position = EditHelper.splitNode(position); - position = EditHelper.splitNode(position); - position = EditHelper.moveInto(position.getNextSiblingNode(), - new InlineEditingNavigationMediator(new ActionData( - ActionData.INLINE_EDIT, null)), true); - setOperationPosition(position); - return true; - } - } - return false; - } + // TODO: dead? +// private boolean splitNode() { +// if ((getViewer()).getSelection() instanceof DesignRange +// && _data.getCharacterData() != null +// && _data.getCharacterData().charValue() == '\r') { +// DesignRange range = (DesignRange) (getViewer()).getSelection(); +// Node node = range.getStartPosition().getContainerNode(); +// if (EditModelQuery.isText(node)) { +// node = node.getParentNode(); +// } +// if (EditModelQuery.isListItem(node)) { +// IDOMPosition position = DOMPositionHelper.toDOMPosition(range +// .getStartPosition()); +// // split text and it's parent. +// position = EditHelper.splitNode(position); +// position = EditHelper.splitNode(position); +// position = EditHelper.moveInto(position.getNextSiblingNode(), +// new InlineEditingNavigationMediator(new ActionData( +// ActionData.INLINE_EDIT, null)), true); +// setOperationPosition(position); +// return true; +// } +// } +// return false; +// } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/KeyboardData.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/KeyboardData.java index c9213b676..7b455af8a 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/KeyboardData.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/KeyboardData.java @@ -75,7 +75,7 @@ public class KeyboardData implements IInputSourceProvider { EditDomain domain = _viewer.getEditDomain(); Document document = null; if (domain instanceof DefaultEditDomain) { - document = (Document) ((HTMLEditor) (((DefaultEditDomain) domain) + document = ((HTMLEditor) (((DefaultEditDomain) domain) .getEditorPart())).getDOMDocument(); } // if ((keyCode.getStateMask() & SWT.SHIFT) != 0) diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/ParagraphApplyStyleCommand.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/ParagraphApplyStyleCommand.java index 444040214..85cef1c5b 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/ParagraphApplyStyleCommand.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/ParagraphApplyStyleCommand.java @@ -225,21 +225,23 @@ public class ParagraphApplyStyleCommand extends ApplyStyleCommand { // compute selected character number in the text or selected element // number under a node int len = 0; - if (start instanceof DOMPosition && end instanceof DOMPosition - || start instanceof IDOMPosition && end instanceof IDOMPosition) { +// if (start instanceof DOMPosition && end instanceof DOMPosition +// || start instanceof IDOMPosition && end instanceof IDOMPosition) { + // TODO: as written, this will be the only statement run, since + // both start and end are instanceof IDOMPosition by defn. len = end.getOffset() - start.getOffset(); - } else { - IDOMRefPosition startRef = null; - IDOMRefPosition endRef = null; - if (!(start.isText()) && start instanceof DOMPosition) { - startRef = new DOMRefPosition(startNode, false); - } else if (!(end.isText()) && end instanceof DOMPosition) { - endRef = new DOMRefPosition(endNode, true); - } - len = (endRef != null ? endRef.getOffset() : end.getOffset()) - - (startRef != null ? startRef.getOffset() : start - .getOffset()); - } +// } else { +// IDOMRefPosition startRef = null; +// IDOMRefPosition endRef = null; +// if (!(start.isText()) && start instanceof DOMPosition) { +// startRef = new DOMRefPosition(startNode, false); +// } else if (!(end.isText()) && end instanceof DOMPosition) { +// endRef = new DOMRefPosition(endNode, true); +// } +// len = (endRef != null ? endRef.getOffset() : end.getOffset()) +// - (startRef != null ? startRef.getOffset() : start +// .getOffset()); +// } // if a full Text node is selected,and the Text node is the only child // of its parent @@ -345,50 +347,48 @@ public class ParagraphApplyStyleCommand extends ApplyStyleCommand { if (common == null) { // should not happen. return null; - } else { - - if (startContainer instanceof Text) { - // if the start offset is 0,then skip split the Text - if (start.getOffset() > 0) { - startContainer = ((Text) startContainer).splitText(start - .getOffset()); - start = new DOMRefPosition(startContainer, false); - } - } else { - startContainer = start.getNextSiblingNode(); - } - if (endContainer instanceof Text) { - if (end.getOffset() > 0) { - endContainer = ((Text) endContainer).splitText(end - .getOffset()); - endContainer = endContainer.getPreviousSibling(); - } else { - endContainer = endContainer.getPreviousSibling(); - } - } else { - endContainer = end.getPreviousSiblingNode(); - } + } + if (startContainer instanceof Text) { + // if the start offset is 0,then skip split the Text + if (start.getOffset() > 0) { + startContainer = ((Text) startContainer).splitText(start + .getOffset()); + start = new DOMRefPosition(startContainer, false); + } + } else { + startContainer = start.getNextSiblingNode(); + } + if (endContainer instanceof Text) { + if (end.getOffset() > 0) { + endContainer = ((Text) endContainer).splitText(end + .getOffset()); + endContainer = endContainer.getPreviousSibling(); + } else { + endContainer = endContainer.getPreviousSibling(); + } + } else { + endContainer = end.getPreviousSiblingNode(); + } - // now the startContainer and the endContainer should share the same - // parent - Element newNode = createStyleElement(); - startContainer.getParentNode() - .insertBefore(newNode, startContainer); + // now the startContainer and the endContainer should share the same + // parent + Element newNode = createStyleElement(); + startContainer.getParentNode() + .insertBefore(newNode, startContainer); - Node sibling = startContainer.getNextSibling(); - newNode.appendChild(startContainer); - Node endNodeSibling = endContainer.getNextSibling(); - while (sibling != null && startContainer != endContainer - && sibling != endNodeSibling) { - Node tempNode = sibling.getNextSibling(); - newNode.appendChild(sibling); - sibling = tempNode; - } + Node sibling = startContainer.getNextSibling(); + newNode.appendChild(startContainer); + Node endNodeSibling = endContainer.getNextSibling(); + while (sibling != null && startContainer != endContainer + && sibling != endNodeSibling) { + Node tempNode = sibling.getNextSibling(); + newNode.appendChild(sibling); + sibling = tempNode; + } - IDOMPosition startPos = new DOMPosition(newNode, 0); - IDOMPosition endPos = new DOMRefPosition(endContainer, true); - return new DOMRange(startPos, endPos); - } + IDOMPosition startPos = new DOMPosition(newNode, 0); + IDOMPosition endPos = new DOMRefPosition(endContainer, true); + return new DOMRange(startPos, endPos); } private static String getAName(String name) { diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/PasteCommand.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/PasteCommand.java index 13ed28de1..f2691c00c 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/PasteCommand.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/PasteCommand.java @@ -39,9 +39,8 @@ public class PasteCommand extends RangeModeCommand { if (edit.operate()) { return new DOMRange(edit.getOperationPosition(), edit .getOperationPosition()); - } else { - return selection; } + return selection; } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/RangeModeCommand.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/RangeModeCommand.java index 40f78b736..60e67ef12 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/RangeModeCommand.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/RangeModeCommand.java @@ -13,9 +13,7 @@ package org.eclipse.jst.pagedesigner.commands.range; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jst.pagedesigner.PDPlugin; import org.eclipse.jst.pagedesigner.commands.DesignerCommand; -import org.eclipse.jst.pagedesigner.common.logging.Logger; import org.eclipse.jst.pagedesigner.dom.DOMPositionHelper; import org.eclipse.jst.pagedesigner.dom.DOMRange; import org.eclipse.jst.pagedesigner.dom.EditModelQuery; @@ -31,8 +29,8 @@ import org.w3c.dom.Node; * @author mengbo */ public abstract class RangeModeCommand extends DesignerCommand { - private static final Logger _log = PDPlugin - .getLogger(RangeModeCommand.class); +// private static final Logger _log = PDPlugin +// .getLogger(RangeModeCommand.class); DOMRange _resultRange = null; @@ -89,9 +87,8 @@ public abstract class RangeModeCommand extends DesignerCommand { getViewer().startSelectionChange(); getModel().aboutToChangeModel(); return true; - } else { - return false; } + return false; } /* @@ -114,7 +111,7 @@ public abstract class RangeModeCommand extends DesignerCommand { * @see org.eclipse.jst.pagedesigner.commands.DesignerCommand#getAfterCommandDesignerSelection() */ protected final ISelection getAfterCommandDesignerSelection() { - try { +// try { if (_resultRange == null) { return null; } @@ -122,16 +119,16 @@ public abstract class RangeModeCommand extends DesignerCommand { DesignPosition start = DOMPositionHelper.toDesignPosition(startPos); if (_resultRange.isEmpty()) { return new DesignRange(start, start); - } else { - IDOMPosition endPos = _resultRange.getEndPosition(); - return new DesignRange(start, DOMPositionHelper - .toDesignPosition(endPos)); } - } catch (Exception e) { - // "Selection error" - _log.error("Error.RangeModeCommand.SetSelection"); //$NON-NLS-1$ - return null; - } + IDOMPosition endPos = _resultRange.getEndPosition(); + return new DesignRange(start, DOMPositionHelper + .toDesignPosition(endPos)); + // TODO: don't know what this exception catch is for +// } catch (Exception e) { +// // "Selection error" +// _log.error("Error.RangeModeCommand.SetSelection"); //$NON-NLS-1$ +// return null; +// } } /** diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/WorkNode.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/WorkNode.java index 9613e2f96..72bee818b 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/WorkNode.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/WorkNode.java @@ -127,8 +127,8 @@ public class WorkNode { this.previous = previous; } - private int[] resoveOffsets(Node node, int pos1, int pos2) { - int left = EditModelQuery.getNodeStartIndex(node); + private int[] resoveOffsets(Node node1, int pos1, int pos2) { + int left = EditModelQuery.getNodeStartIndex(node1); return new int[] { pos1 - left, pos2 - left }; } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/single/ChangeAttributeCommand.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/single/ChangeAttributeCommand.java index 77fa9c028..fa189dab9 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/single/ChangeAttributeCommand.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/single/ChangeAttributeCommand.java @@ -93,9 +93,8 @@ public class ChangeAttributeCommand extends SingleNodeCommand { private boolean isEmptyString(String str) { if (str == null || str.equals("")) { return true; - } else { - return false; } + return false; } /** diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/AbstractTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/AbstractTagConverter.java index 8bfd3ecdd..5f7e65151 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/AbstractTagConverter.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/AbstractTagConverter.java @@ -180,6 +180,10 @@ public abstract class AbstractTagConverter implements ITagConverter, * @see org.eclipse.jst.pagedesigner.visualtag.ITagConverter#dispose() */ public void dispose() { + // do nothing; children may wish to sub-class + // TODO: null shared references? + // this doesn't seem to be called by anybody.. + // need to review this } protected boolean shouldIgnore(Node node) { @@ -234,9 +238,8 @@ public abstract class AbstractTagConverter implements ITagConverter, public IDOMDocument getDestDocument() { if (this._targetDocument != null) { return this._targetDocument; - } else { - return (IDOMDocument) _hostElement.getOwnerDocument(); } + return (IDOMDocument) _hostElement.getOwnerDocument(); } /** diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/ConverterFactoryRegistry.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/ConverterFactoryRegistry.java index ba738678e..483ecdf9e 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/ConverterFactoryRegistry.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/ConverterFactoryRegistry.java @@ -91,19 +91,17 @@ public class ConverterFactoryRegistry { if (uri == null || IJMTConstants.URI_HTML.equals(uri)) { // basically, for HTML or non JSP tag, directly renders it. return new DumTagConverter(ele); - } else { - CMElementDeclaration decl = CMUtil.getElementDeclaration(ele); - if (decl == null) { - return new DumTagConverter(ele); - } - int contentType = decl.getContentType(); - if (contentType == CMElementDeclaration.EMPTY) { - // if the tag is empty, show it as icon. - return new HiddenTagConverter(ele, getUnknownImage()); - } else { - return new DefaultUnknownTagConverter(ele); - } } + CMElementDeclaration decl = CMUtil.getElementDeclaration(ele); + if (decl == null) { + return new DumTagConverter(ele); + } + int contentType = decl.getContentType(); + if (contentType == CMElementDeclaration.EMPTY) { + // if the tag is empty, show it as icon. + return new HiddenTagConverter(ele, getUnknownImage()); + } + return new DefaultUnknownTagConverter(ele); } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/DumDeepTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/DumDeepTagConverter.java index c56d0760c..079487bcd 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/DumDeepTagConverter.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/DumDeepTagConverter.java @@ -11,7 +11,6 @@ *******************************************************************************/ package org.eclipse.jst.pagedesigner.converter; -import org.eclipse.jst.pagedesigner.IHTMLConstants; import org.eclipse.jst.pagedesigner.dom.DOMUtil; import org.w3c.dom.Element; @@ -51,21 +50,22 @@ public class DumDeepTagConverter extends AbstractTagConverter { * @param result * @return */ - private boolean internalIsWidget(Element result) { - String tagname = result.getTagName(); - if (IHTMLConstants.TAG_INPUT.equalsIgnoreCase(tagname) - || IHTMLConstants.TAG_SELECT.equalsIgnoreCase(tagname) - || IHTMLConstants.TAG_TEXTAREA.equalsIgnoreCase(tagname) - || IHTMLConstants.TAG_IMG.equalsIgnoreCase(tagname) - || IHTMLConstants.TAG_HEAD.equalsIgnoreCase(tagname) - || IHTMLConstants.TAG_SCRIPT.equalsIgnoreCase(tagname) - || IHTMLConstants.TAG_LINK.equalsIgnoreCase(tagname)) { - return true; - } else { - - return false; - } - } + // TODO: dead? +// private boolean internalIsWidget(Element result) { +// String tagname = result.getTagName(); +// if (IHTMLConstants.TAG_INPUT.equalsIgnoreCase(tagname) +// || IHTMLConstants.TAG_SELECT.equalsIgnoreCase(tagname) +// || IHTMLConstants.TAG_TEXTAREA.equalsIgnoreCase(tagname) +// || IHTMLConstants.TAG_IMG.equalsIgnoreCase(tagname) +// || IHTMLConstants.TAG_HEAD.equalsIgnoreCase(tagname) +// || IHTMLConstants.TAG_SCRIPT.equalsIgnoreCase(tagname) +// || IHTMLConstants.TAG_LINK.equalsIgnoreCase(tagname)) { +// return true; +// } else { +// +// return false; +// } +// } /* * (non-Javadoc) diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/DumTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/DumTagConverter.java index 6abec2f10..43c987e2f 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/DumTagConverter.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/DumTagConverter.java @@ -77,10 +77,8 @@ public class DumTagConverter extends AbstractTagConverter { || IHTMLConstants.TAG_STYLE.equalsIgnoreCase(tagname) || IHTMLConstants.TAG_HR.equalsIgnoreCase(tagname)) { return true; - } else { - - return false; } + return false; } /* diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/HTMLStringTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/HTMLStringTagConverter.java index 610b0c061..4e9f4009d 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/HTMLStringTagConverter.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/HTMLStringTagConverter.java @@ -18,8 +18,8 @@ import org.eclipse.jst.pagedesigner.PDPlugin; import org.eclipse.jst.pagedesigner.common.logging.Logger; import org.eclipse.jst.pagedesigner.common.utils.ResourceUtils; import org.eclipse.jst.pagedesigner.dom.DOMUtil; +import org.eclipse.wst.sse.core.StructuredModelManager; import org.eclipse.wst.sse.core.internal.provisional.IModelManager; -import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; import org.w3c.dom.Element; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/HiddenTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/HiddenTagConverter.java index 23714d7ad..122afec79 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/HiddenTagConverter.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/HiddenTagConverter.java @@ -47,6 +47,7 @@ public class HiddenTagConverter implements ITagConverter { * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#setDestDocument(org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument) */ public void setDestDocument(IDOMDocument document) { + // do nothing? } /* @@ -136,6 +137,8 @@ public class HiddenTagConverter implements ITagConverter { * @see org.eclipse.jst.pagedesigner.visualtag.ITagConverter#dispose() */ public void dispose() { + // do nothing + // TODO: dispose of image or Element here? } /* diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/html/ATagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/html/ATagConverter.java index ab9708102..a86dd8902 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/html/ATagConverter.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/html/ATagConverter.java @@ -43,9 +43,8 @@ public class ATagConverter extends DumTagConverter { Text fakedNode = createText("link"); resultEle.appendChild(fakedNode); return resultEle; - } else { - return super.doConvertRefresh(); } + return super.doConvertRefresh(); } /* diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/jsp/IncludeTagConverterPreview.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/jsp/IncludeTagConverterPreview.java index 00c0f9909..a0d46ca46 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/jsp/IncludeTagConverterPreview.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/jsp/IncludeTagConverterPreview.java @@ -66,17 +66,15 @@ public class IncludeTagConverterPreview extends AbstractTagConverter { String fileName = getResolvedURL(getHostElement(), this._fileAttrName); if (fileName == null || fileName.length() == 0) { return null; - } else { - IPath includedPath = new Path(fileName); - includedPath.makeAbsolute(); - - IFile file = getFile(includedPath); - if (file == null) { - return null; - } else { - return previewFile(file); - } } + IPath includedPath = new Path(fileName); + includedPath.makeAbsolute(); + + IFile file = getFile(includedPath); + if (file == null) { + return null; + } + return previewFile(file); } public IFile getFile(IPath includedPath) { @@ -165,6 +163,7 @@ public class IncludeTagConverterPreview extends AbstractTagConverter { static String getResolvedURL(Element element, String attrName) { URIResolver resolver = null; if (element instanceof IDOMNode) { + // TODO: the new URI resolver is not available on the IStructuredModel resolver = ((IDOMNode) element).getModel().getResolver(); } if (null == resolver) { diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/jsp/JSPConverterFactory.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/jsp/JSPConverterFactory.java index 9931241f4..b969136d0 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/jsp/JSPConverterFactory.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/jsp/JSPConverterFactory.java @@ -30,6 +30,7 @@ public class JSPConverterFactory implements IConverterFactory { * */ public JSPConverterFactory() { + // do nothing } /* @@ -63,15 +64,14 @@ public class JSPConverterFactory implements IConverterFactory { } else { return new HiddenTagConverter(element, image); } - } else { - if (IJSPCoreConstants.TAG_ROOT.equalsIgnoreCase(tagName)) { - TagConverterToDumBlock c = new TagConverterToDumBlock(element); - c.setNeedBorderDecorator(true); - c.setMode(mode); - return c; - } - return new HiddenTagConverter(element, image); } + if (IJSPCoreConstants.TAG_ROOT.equalsIgnoreCase(tagName)) { + TagConverterToDumBlock c = new TagConverterToDumBlock(element); + c.setNeedBorderDecorator(true); + c.setMode(mode); + return c; + } + return new HiddenTagConverter(element, image); } /** diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/CSSUtil.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/CSSUtil.java index d20a2b3a7..e9f5ee2eb 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/CSSUtil.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/CSSUtil.java @@ -30,9 +30,9 @@ import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel; import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; import org.eclipse.wst.css.core.internal.util.CSSClassTraverser; import org.eclipse.wst.html.core.internal.htmlcss.CSSQueryTraverser; +import org.eclipse.wst.sse.core.StructuredModelManager; import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier; import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; -import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -91,9 +91,8 @@ public class CSSUtil { } if (style == null) { return DefaultStyle.getInstance(); - } else { - return style; } + return style; } /** diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/border/CSSBorder.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/border/CSSBorder.java index a8e8934f6..b2afe44df 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/border/CSSBorder.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/border/CSSBorder.java @@ -97,46 +97,41 @@ public class CSSBorder extends AbstractBorder { return getDefaultColors(graphics, style, edge); } } - + // TODO: needs refactoring private RGB[] getDefaultColors(Graphics graphics, String style, String edge) { if (ICSSPropertyID.VAL_OUTSET.equals(style)) { if (ICSSStyle.TOP.equals(edge) || ICSSStyle.LEFT.equals(edge)) { return new RGB[] { ColorConstants.button.getRGB(), ColorConstants.buttonLightest.getRGB() }; - } else { - return new RGB[] { ColorConstants.buttonDarkest.getRGB(), - ColorConstants.buttonDarker.getRGB() }; } + return new RGB[] { ColorConstants.buttonDarkest.getRGB(), + ColorConstants.buttonDarker.getRGB() }; } else if (ICSSPropertyID.VAL_INSET.equals(style)) { if (ICSSStyle.TOP.equals(edge) || ICSSStyle.LEFT.equals(edge)) { return new RGB[] { ColorConstants.buttonDarker.getRGB(), ColorConstants.buttonDarkest.getRGB() }; - } else { - return new RGB[] { ColorConstants.buttonLightest.getRGB(), - ColorConstants.button.getRGB() }; } + return new RGB[] { ColorConstants.buttonLightest.getRGB(), + ColorConstants.button.getRGB() }; } else if (ICSSPropertyID.VAL_TDBORDERSTYLE.equals(style)) { if (ICSSStyle.TOP.equals(edge) || ICSSStyle.LEFT.equals(edge)) { return new RGB[] { ColorConstants.buttonDarker.getRGB() }; - } else { - return new RGB[] { ColorConstants.button.getRGB() }; } + return new RGB[] { ColorConstants.button.getRGB() }; } else if (ICSSPropertyID.VAL_RIDGE.equals(style)) { if (ICSSStyle.TOP.equals(edge) || ICSSStyle.LEFT.equals(edge)) { return new RGB[] { ColorConstants.button.getRGB(), ColorConstants.buttonDarkest.getRGB() }; - } else { - return new RGB[] { ColorConstants.buttonDarkest.getRGB(), - ColorConstants.button.getRGB() }; } + return new RGB[] { ColorConstants.buttonDarkest.getRGB(), + ColorConstants.button.getRGB() }; } else if (ICSSPropertyID.VAL_GROOVE.equals(style)) { if (ICSSStyle.TOP.equals(edge) || ICSSStyle.LEFT.equals(edge)) { return new RGB[] { ColorConstants.buttonDarker.getRGB(), ColorConstants.buttonLightest.getRGB() }; - } else { - return new RGB[] { ColorConstants.buttonLightest.getRGB(), - ColorConstants.buttonDarker.getRGB(), }; } + return new RGB[] { ColorConstants.buttonLightest.getRGB(), + ColorConstants.buttonDarker.getRGB(), }; } else if (ICSSPropertyID.VAL_DOUBLE.equals(style)) { return new RGB[] { ColorConstants.buttonDarkest.getRGB(), graphics.getBackgroundColor().getRGB(), @@ -148,81 +143,77 @@ public class CSSBorder extends AbstractBorder { return new RGB[] { ColorConstants.black.getRGB() }; } + // TODO: needs refactoring private RGB[] getCustomColors(Graphics graphics, String style, String edge, RGB baseColor) { if (ICSSPropertyID.VAL_OUTSET.equals(style)) { if (ICSSStyle.TOP.equals(edge) || ICSSStyle.LEFT.equals(edge)) { return new RGB[] { - new RGB((int) baseColor.red * 3 / 4, - (int) baseColor.green * 3 / 4, - (int) baseColor.blue * 3 / 4), + new RGB(baseColor.red * 3 / 4, + baseColor.green * 3 / 4, + baseColor.blue * 3 / 4), new RGB(baseColor.red, baseColor.green, baseColor.blue) }; - } else { - return new RGB[] { - new RGB((int) baseColor.red / 2, - (int) baseColor.green / 2, - (int) baseColor.blue / 2), - new RGB((int) baseColor.red / 4, - (int) baseColor.green / 4, - (int) baseColor.blue / 4) }; } + return new RGB[] { + new RGB(baseColor.red / 2, + baseColor.green / 2, + baseColor.blue / 2), + new RGB(baseColor.red / 4, + baseColor.green / 4, + baseColor.blue / 4) }; } else if (ICSSPropertyID.VAL_INSET.equals(style)) { if (ICSSStyle.TOP.equals(edge) || ICSSStyle.LEFT.equals(edge)) { return new RGB[] { - new RGB((int) baseColor.red / 4, - (int) baseColor.green / 4, - (int) baseColor.blue / 4), - new RGB((int) baseColor.red / 2, - (int) baseColor.green / 2, - (int) baseColor.blue / 2) }; - } else { - return new RGB[] { - new RGB(baseColor.red, baseColor.green, baseColor.blue), - new RGB((int) baseColor.red * 3 / 4, - (int) baseColor.green * 3 / 4, - (int) baseColor.blue * 3 / 4), }; + new RGB(baseColor.red / 4, + baseColor.green / 4, + baseColor.blue / 4), + new RGB(baseColor.red / 2, + baseColor.green / 2, + baseColor.blue / 2) }; } + return new RGB[] { + new RGB(baseColor.red, baseColor.green, baseColor.blue), + new RGB(baseColor.red * 3 / 4, + baseColor.green * 3 / 4, + baseColor.blue * 3 / 4), }; } else if (ICSSPropertyID.VAL_TDBORDERSTYLE.equals(style)) { if (ICSSStyle.TOP.equals(edge) || ICSSStyle.LEFT.equals(edge)) { - return new RGB[] { new RGB((int) baseColor.red / 4, - (int) baseColor.green / 4, (int) baseColor.blue / 4) }; - } else { - return new RGB[] { new RGB(baseColor.red, baseColor.green, - baseColor.blue) }; + return new RGB[] { new RGB(baseColor.red / 4, + baseColor.green / 4, baseColor.blue / 4) }; } + return new RGB[] { new RGB(baseColor.red, baseColor.green, + baseColor.blue) }; } else if (ICSSPropertyID.VAL_RIDGE.equals(style)) { if (ICSSStyle.TOP.equals(edge) || ICSSStyle.LEFT.equals(edge)) { return new RGB[] { - new RGB((int) baseColor.red * 3 / 4, - (int) baseColor.green * 3 / 4, - (int) baseColor.blue * 3 / 4), - new RGB((int) baseColor.red / 2, - (int) baseColor.green / 2, - (int) baseColor.blue / 2) }; - } else { - return new RGB[] { - new RGB((int) baseColor.red / 2, - (int) baseColor.green / 2, - (int) baseColor.blue / 2), - new RGB((int) baseColor.red * 3 / 4, - (int) baseColor.green * 3 / 4, - (int) baseColor.blue * 3 / 4) }; + new RGB(baseColor.red * 3 / 4, + baseColor.green * 3 / 4, + baseColor.blue * 3 / 4), + new RGB(baseColor.red / 2, + baseColor.green / 2, + baseColor.blue / 2) }; } + return new RGB[] { + new RGB(baseColor.red / 2, + baseColor.green / 2, + baseColor.blue / 2), + new RGB(baseColor.red * 3 / 4, + baseColor.green * 3 / 4, + baseColor.blue * 3 / 4) }; } else if (ICSSPropertyID.VAL_GROOVE.equals(style)) { if (ICSSStyle.TOP.equals(edge) || ICSSStyle.LEFT.equals(edge)) { return new RGB[] { - new RGB((int) baseColor.red / 4, - (int) baseColor.green / 4, - (int) baseColor.blue / 4), + new RGB(baseColor.red / 4, + baseColor.green / 4, + baseColor.blue / 4), new RGB(baseColor.red, baseColor.green, baseColor.blue) }; - } else { - return new RGB[] { - new RGB(baseColor.red, baseColor.green, baseColor.blue), - new RGB((int) baseColor.red / 4, - (int) baseColor.green / 4, - (int) baseColor.blue / 4) }; } + return new RGB[] { + new RGB(baseColor.red, baseColor.green, baseColor.blue), + new RGB(baseColor.red / 4, + baseColor.green / 4, + baseColor.blue / 4) }; } else if (ICSSPropertyID.VAL_DOUBLE.equals(style)) { return new RGB[] { new RGB(baseColor.red, baseColor.green, baseColor.blue), diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/color/CSSColorConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/color/CSSColorConverter.java index f493a893e..8df347ed4 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/color/CSSColorConverter.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/color/CSSColorConverter.java @@ -38,7 +38,7 @@ public class CSSColorConverter { if (CSSText == null) { return null; } - ; + CSSText = CSSText.trim().toLowerCase(); if (CSSText.length() == 0) { return null; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/color/CSSColorManager.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/color/CSSColorManager.java index ec3542ada..042bb300d 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/color/CSSColorManager.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/color/CSSColorManager.java @@ -18,6 +18,7 @@ public class CSSColorManager { private static CSSColorManager _instance; private CSSColorManager() { + // no external instantiation } public static CSSColorManager getInstance() { diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/font/CSSFont.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/font/CSSFont.java index 504fd4288..44e3e4de1 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/font/CSSFont.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/font/CSSFont.java @@ -70,8 +70,8 @@ public class CSSFont implements ICSSFont { CSSFont fd = (CSSFont) obj; return this._family.equals(fd._family) && this._size == fd._size && this._style == fd._style && this._weight == fd._weight; - } else - return false; + } + return false; } /* diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/BlockFlowContext.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/BlockFlowContext.java index 55faec578..7cb5efdf4 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/BlockFlowContext.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/BlockFlowContext.java @@ -220,9 +220,8 @@ public class BlockFlowContext implements FlowContext { _currentLine.getFragments().size() - 1); if (box != null) { return box._marginInsets.right; - } else { - return 0; } + return 0; } /* diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/BlockFlowLayout.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/BlockFlowLayout.java index 8647f293c..f50ee6093 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/BlockFlowLayout.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/BlockFlowLayout.java @@ -236,6 +236,7 @@ public class BlockFlowLayout extends FlowContainerLayout { * @see org.eclipse.jst.pagedesigner.css2.layout.FlowFigureLayout#dispose() */ public void dispose() { + // TODO: anything to dispose? } /* diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSBlockFlowLayout.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSBlockFlowLayout.java index 6460f5ffd..8e6fa4c2b 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSBlockFlowLayout.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSBlockFlowLayout.java @@ -77,10 +77,9 @@ public class CSSBlockFlowLayout extends CSSLayout implements ICSSPainter2 { ICSSStyle style = getCSSStyle(); if (style == null) { return false; - } else { - return "block".equalsIgnoreCase(style.getDisplay()) - || "list-item".equalsIgnoreCase(style.getDisplay()); } + return "block".equalsIgnoreCase(style.getDisplay()) + || "list-item".equalsIgnoreCase(style.getDisplay()); } // --------------------------------------------------------------------------------------------------- diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSFigure.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSFigure.java index 60580d2bb..1a258153f 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSFigure.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSFigure.java @@ -137,9 +137,8 @@ public class CSSFigure extends FlowFigure implements ICSSFigure { .getDisplay(), old); if (layout != null) { return layout; - } else { - return new CSSInlineFlowLayout(this); } + return new CSSInlineFlowLayout(this); } /* @@ -186,15 +185,14 @@ public class CSSFigure extends FlowFigure implements ICSSFigure { if (list == null || list.size() == 0) { // should not happen. but still handle it. return new Rectangle[] { getBounds() }; - } else { - Rectangle[] ret = new Rectangle[list.size()]; - for (int i = 0, size = list.size(); i < size; i++) { - FlowBox box = (FlowBox) list.get(i); - ret[i] = new Rectangle(box._x, box._y, box.getWidth(), box - .getHeight()); - } - return ret; } + Rectangle[] ret = new Rectangle[list.size()]; + for (int i = 0, size = list.size(); i < size; i++) { + FlowBox box = (FlowBox) list.get(i); + ret[i] = new Rectangle(box._x, box._y, box.getWidth(), box + .getHeight()); + } + return ret; } /* @@ -247,9 +245,8 @@ public class CSSFigure extends FlowFigure implements ICSSFigure { CSSLayout layout = (CSSLayout) getLayoutManager(); if (layout == null) { return false; - } else { - return layout.useLocalCoordinates(); } + return layout.useLocalCoordinates(); } /* @@ -471,8 +468,8 @@ public class CSSFigure extends FlowFigure implements ICSSFigure { ICSSStyle style = this.getCSSStyle(); if (style != null) { - CSSBorder border = new CSSBorder(this.getCSSStyle()); - border.paint(this, graphics, NO_INSETS); + CSSBorder border1 = new CSSBorder(this.getCSSStyle()); + border1.paint(this, graphics, NO_INSETS); // draw a border for those special elements like <h:form>, etc. ITagEditInfo editInfo = (ITagEditInfo) style diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSLayout.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSLayout.java index c38052946..99081a798 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSLayout.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSLayout.java @@ -188,9 +188,8 @@ public abstract class CSSLayout extends FlowFigureLayout implements FlowContext public FlowContext getFlowContext() { if (_absoluteContext != null) { return _absoluteContext; - } else { - return getOriginalFlowContext(); } + return getOriginalFlowContext(); } public FlowContext getParentFigureContext() { @@ -272,7 +271,7 @@ public abstract class CSSLayout extends FlowFigureLayout implements FlowContext } // xOffset is relative to the first box of the containing figure - List fragments = ((ICSSFigure) containingPositionedFigure) + List fragments = containingPositionedFigure .getFragmentsForRead(); if (fragments.size() > 0) { FlowBox box = (FlowBox) fragments.get(0); @@ -360,9 +359,8 @@ public abstract class CSSLayout extends FlowFigureLayout implements FlowContext _currentLine.getFragments().size() - 1); if (box != null) { return box._marginInsets.right; - } else { - return 0; } + return 0; } public void setCalculatingMaxWidth(boolean c) { @@ -425,6 +423,7 @@ public abstract class CSSLayout extends FlowFigureLayout implements FlowContext * @param invalidate */ public void setBoundsCalled(Rectangle rect, boolean invalidate) { + // TODO: dead? } /** diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSTextFigure.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSTextFigure.java index a5a2871d1..9994cbbe5 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSTextFigure.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSTextFigure.java @@ -181,6 +181,7 @@ public class CSSTextFigure extends FlowFigure implements ICSSFigure { * @param relative * @return */ + // TODO: refactoring? public int getNewInsertionOffset(Point relative) { TextFragmentBox closestBox = null; // if there is one which are at the same line with relative, calculate @@ -193,46 +194,45 @@ public class CSSTextFigure extends FlowFigure implements ICSSFigure { - box._x, TextLayoutSupport .getAverageCharWidth(box)); return box._offset + index; - } else { - if (closestBox == null) { - closestBox = box; - } else { - // box is above point - TextFragmentBox tempBox = box; - int offset1 = Math - .abs(CaretPositionResolver.getYDistance( - new Rectangle(tempBox._x, tempBox._y, - tempBox._width, tempBox._height), - relative)); - tempBox = closestBox; - int offset2 = Math - .abs(CaretPositionResolver.getYDistance( - new Rectangle(tempBox._x, tempBox._y, - tempBox._width, tempBox._height), - relative)); - if (offset1 < offset2) { - closestBox = box; - } - } - // at the same line - if (box.containsPoint(box._x, relative.y)) { - TextFragmentBox tempBox = box; - int offset1 = Math - .abs(CaretPositionResolver.getXDistance( - new Rectangle(tempBox._x, tempBox._y, - tempBox._width, tempBox._height), - relative)); - tempBox = closestBox; - int offset2 = Math - .abs(CaretPositionResolver.getXDistance( - new Rectangle(tempBox._x, tempBox._y, - tempBox._width, tempBox._height), - relative)); - if (offset1 < offset2) { - closestBox = box; - } - } } + if (closestBox == null) { + closestBox = box; + } else { + // box is above point + TextFragmentBox tempBox = box; + int offset1 = Math + .abs(CaretPositionResolver.getYDistance( + new Rectangle(tempBox._x, tempBox._y, + tempBox._width, tempBox._height), + relative)); + tempBox = closestBox; + int offset2 = Math + .abs(CaretPositionResolver.getYDistance( + new Rectangle(tempBox._x, tempBox._y, + tempBox._width, tempBox._height), + relative)); + if (offset1 < offset2) { + closestBox = box; + } + } + // at the same line + if (box.containsPoint(box._x, relative.y)) { + TextFragmentBox tempBox = box; + int offset1 = Math + .abs(CaretPositionResolver.getXDistance( + new Rectangle(tempBox._x, tempBox._y, + tempBox._width, tempBox._height), + relative)); + tempBox = closestBox; + int offset2 = Math + .abs(CaretPositionResolver.getXDistance( + new Rectangle(tempBox._x, tempBox._y, + tempBox._width, tempBox._height), + relative)); + if (offset1 < offset2) { + closestBox = box; + } + } } if (closestBox.containsPoint(closestBox._x, relative.y) @@ -242,9 +242,8 @@ public class CSSTextFigure extends FlowFigure implements ICSSFigure { getCSSStyle().getCSSFont().getSwtFont(), offset, TextLayoutSupport.getAverageCharWidth(closestBox)); return closestBox._offset + index; - } else { - return -1; } + return -1; } public int getInsertionOffset(Point relative) { @@ -278,14 +277,13 @@ public class CSSTextFigure extends FlowFigure implements ICSSFigure { if (box._offset + box._length < offset) { return new Rectangle(box._x + box._width, box._y, 1, box._height); - } else { - String s = box.getTextData().substring(0, - offset - box._offset); - int width = FlowUtilities.getTextExtents(s, - getCSSStyle().getCSSFont().getSwtFont()).width; - return new Rectangle(box._x + width, box._y, 1, - box._height); } + String s = box.getTextData().substring(0, + offset - box._offset); + int width = FlowUtilities.getTextExtents(s, + getCSSStyle().getCSSFont().getSwtFont()).width; + return new Rectangle(box._x + width, box._y, 1, + box._height); } } } else { @@ -295,8 +293,7 @@ public class CSSTextFigure extends FlowFigure implements ICSSFigure { } } // should only reach here when there is no fragments. - Rectangle bounds = this.getBounds(); - return new Rectangle(bounds.x, bounds.y, 1, bounds.height); + return new Rectangle(getBounds().x, getBounds().y, 1, getBounds().height); } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSTextLayout.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSTextLayout.java index b61a37a94..d452e0dc2 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSTextLayout.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSTextLayout.java @@ -172,5 +172,6 @@ public class CSSTextLayout extends FlowFigureLayout { } public void dispose() { + // TODO: anything to dispose? } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSWidgetLayout.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSWidgetLayout.java index 1c83653d2..ef573ee78 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSWidgetLayout.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSWidgetLayout.java @@ -107,6 +107,7 @@ public class CSSWidgetLayout extends CSSBlockFlowLayout implements ICSSPainter { * @see org.eclipse.jst.pagedesigner.css2.layout.FlowFigureLayout#dispose() */ public void dispose() { + // TODO: anything to dispose? } // public int getSuggestedWidth(LineBox line, ICSSStyle style, diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/DisplayToLayout.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/DisplayToLayout.java index de2eaa8d9..d67849b11 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/DisplayToLayout.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/DisplayToLayout.java @@ -93,8 +93,7 @@ public class DisplayToLayout { Object position = style.getStyleProperty(ICSSPropertyID.ATTR_POSITION); if (PositionMeta.STATIC.equalsIgnoreCase((String) position)) { return false; - } else { - return true; } + return true; } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/FlowContainerLayout.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/FlowContainerLayout.java index b53cf7f2c..aa17d120a 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/FlowContainerLayout.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/FlowContainerLayout.java @@ -14,8 +14,6 @@ package org.eclipse.jst.pagedesigner.css2.layout; import java.util.List; import org.eclipse.draw2d.Figure; -import org.eclipse.jst.pagedesigner.PDPlugin; -import org.eclipse.jst.pagedesigner.common.logging.Logger; /** * A layout for FlowFigures with children. @@ -27,7 +25,7 @@ import org.eclipse.jst.pagedesigner.common.logging.Logger; */ public abstract class FlowContainerLayout extends FlowFigureLayout implements FlowContext { - private static Logger _log = PDPlugin.getLogger(FlowContainerLayout.class); +// private static Logger _log = PDPlugin.getLogger(FlowContainerLayout.class); /** * the current line @@ -134,9 +132,8 @@ public abstract class FlowContainerLayout extends FlowFigureLayout implements _currentLine.getFragments().size() - 1); if (box != null) { return box._marginInsets.right; - } else { - return 0; } + return 0; } public void setCalculatingMaxWidth(boolean c) { diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/FlowFigure.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/FlowFigure.java index 7c15e1278..e231a6f76 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/FlowFigure.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/FlowFigure.java @@ -116,9 +116,10 @@ public abstract class FlowFigure extends Figure { public String toString() { if (_displayString == null) + { return super.toString(); - else - return _displayString + " " + getClass().getName(); + } + return _displayString + " " + getClass().getName(); } String _displayString; // for debug diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/MultiLineLabel.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/MultiLineLabel.java index 24ed25588..4ea41d981 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/MultiLineLabel.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/MultiLineLabel.java @@ -26,10 +26,10 @@ public class MultiLineLabel extends Label { if (isOpaque()) { graphics.fillRectangle(getBounds()); } - Rectangle bounds = getBounds(); - graphics.translate(bounds.x, bounds.y); + Rectangle bounds1 = getBounds(); + graphics.translate(bounds1.x, bounds1.y); drawText(graphics); - graphics.translate(-bounds.x, -bounds.y); + graphics.translate(-bounds1.x, -bounds1.y); } private void drawText(Graphics graphics) { diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/PageFlowLayout.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/PageFlowLayout.java index 54dedbfaf..33ff6a106 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/PageFlowLayout.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/PageFlowLayout.java @@ -38,12 +38,14 @@ public class PageFlowLayout extends BlockFlowLayout { * @see BlockFlowLayout#endBlock() */ protected void endBlock() { + // do nothing } /** - * TODO: This method is not being called. + * */ public void postValidate() { + // TODO: This method is not being called. } protected void setupLine(LineBox line, int topMargin) { diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/TextFragmentBox.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/TextFragmentBox.java index 00b181da8..80907513f 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/TextFragmentBox.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/TextFragmentBox.java @@ -34,6 +34,7 @@ public class TextFragmentBox extends FlowBox { * Creates a new TextFragmentBox */ public TextFragmentBox() { + // do nothgin } /** diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/WidgetBox.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/WidgetBox.java index 7143e83d2..5be873bb9 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/WidgetBox.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/WidgetBox.java @@ -23,9 +23,8 @@ public class WidgetBox extends FlowBox { public int getAscent() { if (_ascent < 0) { return super.getAscent(); - } else { - return _ascent; } + return _ascent; } public void setAscent(int ascent) { diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/CSSTRGroupLayout.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/CSSTRGroupLayout.java index 814c7026a..febcc180e 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/CSSTRGroupLayout.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/CSSTRGroupLayout.java @@ -19,7 +19,6 @@ import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.jst.pagedesigner.css2.layout.CSSBlockFlowLayout; import org.eclipse.jst.pagedesigner.css2.layout.CSSFigure; import org.eclipse.jst.pagedesigner.css2.layout.FlowFigure; -import org.eclipse.jst.pagedesigner.css2.layout.ICSSFigure; /** * @author mengbo @@ -98,7 +97,7 @@ public class CSSTRGroupLayout extends CSSBlockFlowLayout { for (int k = 0; k < rowCount; k++) { height += tableLayout.getRowHeights()[rowIndex + k]; } - ICSSFigure figure = groupinfo.getFigure(); + //ICSSFigure figure = groupinfo.getFigure(); return new Rectangle(tableLayout.getRowX(), y, tableLayout .getRowWidth(), height); } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/CSSTRLayout.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/CSSTRLayout.java index d29fdfcf4..9bf3fc6a0 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/CSSTRLayout.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/CSSTRLayout.java @@ -19,7 +19,6 @@ import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.jst.pagedesigner.css2.layout.CSSBlockFlowLayout; import org.eclipse.jst.pagedesigner.css2.layout.CSSFigure; import org.eclipse.jst.pagedesigner.css2.layout.FlowFigure; -import org.eclipse.jst.pagedesigner.css2.layout.ICSSFigure; /** * @author mengbo @@ -128,7 +127,7 @@ public class CSSTRLayout extends CSSBlockFlowLayout { } int height = tableLayout.getRowHeights()[rowIndex]; - ICSSFigure figure = rowinfo.getFigure(); + //ICSSFigure figure = rowinfo.getFigure(); return new Rectangle(tableLayout.getRowX(), y, tableLayout .getRowWidth(), height); } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/CSSTableLayout2.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/CSSTableLayout2.java index 5acdfb1af..4c4a7a3ab 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/CSSTableLayout2.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/CSSTableLayout2.java @@ -513,15 +513,14 @@ public class CSSTableLayout2 extends CSSBlockFlowLayout implements ICSSPainter { if (spanwidth >= width) { return; - } else { - int delta = width - spanwidth; - int deltaeach = delta / colspan; - for (int i = 0; i < colspan - 1; i++) { - columnWidths[column + i] += deltaeach; - } - columnWidths[column + colspan - 1] += (delta - (colspan - 1) - * deltaeach); } + int delta = width - spanwidth; + int deltaeach = delta / colspan; + for (int i = 0; i < colspan - 1; i++) { + columnWidths[column + i] += deltaeach; + } + columnWidths[column + colspan - 1] += (delta - (colspan - 1) + * deltaeach); } /** diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/CachedTableCellLayout.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/CachedTableCellLayout.java index 40c734e00..6a6ac4d6a 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/CachedTableCellLayout.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/CachedTableCellLayout.java @@ -184,9 +184,8 @@ public abstract class CachedTableCellLayout extends CSSBlockFlowLayout { } if (h > _pageSizeCacheValues[0].height) { return new Dimension(_pageSizeCacheValues[0].width, h); - } else { - return _pageSizeCacheValues[0]; } + return _pageSizeCacheValues[0]; } finally { _calculatingSize = false; } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/TableCaptionInfo.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/TableCaptionInfo.java index 8a8b5c18f..985aba4d5 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/TableCaptionInfo.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/TableCaptionInfo.java @@ -56,8 +56,7 @@ public class TableCaptionInfo extends TableItemInfo { if ("bottom".equalsIgnoreCase(_align)) //$NON-NLS-1$ { return _align; - } else { - return "top"; //$NON-NLS-1$ } + return "top"; //$NON-NLS-1$ } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/TableCellInfo.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/TableCellInfo.java index cc41b1f92..72172c846 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/TableCellInfo.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/TableCellInfo.java @@ -88,10 +88,10 @@ public class TableCellInfo extends TableItemInfo { Dimension d = ((CSSTableCellLayout) layout).getMaxContentWidthSize( figure, _cellWidth, _cellHeight); return d; - } else { - // should not happen - return getMinCWDimension(); } + + // should not happen + return getMinCWDimension(); } /** diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/TableInfoContext.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/TableInfoContext.java index 4cd3fbdd2..f9a358dac 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/TableInfoContext.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/TableInfoContext.java @@ -36,6 +36,7 @@ public class TableInfoContext { * */ public TableInfoContext() { + // do nothing } /** @@ -101,6 +102,7 @@ public class TableInfoContext { * */ public void finishRowGroup() { + // TODO: does nothing; only called in one places } /** diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/list/CSSHtmlListStyleData.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/list/CSSHtmlListStyleData.java index 279c092f9..971199224 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/list/CSSHtmlListStyleData.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/list/CSSHtmlListStyleData.java @@ -13,7 +13,6 @@ package org.eclipse.jst.pagedesigner.css2.list; import org.eclipse.jst.pagedesigner.css2.property.ICSSPropertyID; import org.eclipse.swt.graphics.Image; -import org.eclipse.wst.sse.core.internal.util.URIResolver; /** * @author mengbo @@ -39,7 +38,7 @@ public class CSSHtmlListStyleData { public final static int LIST_T_UPPER_ROMAN = 0x16; - private CSSMarkerStyleData _markerStyleData; + //private CSSMarkerStyleData _markerStyleData; private Image _markerImage; @@ -50,12 +49,14 @@ public class CSSHtmlListStyleData { } private String getResolvedURL() { - String textValue = _markerStyleData.getTextContent(); - URIResolver resolver = null;// FIXME: this is not implemented yet. + //String textValue = _markerStyleData.getTextContent(); + // TODO: when I found this, resolver was not being set and would either + // have thrown NPE or returned "".. so I've "improved it :) + //URIResolver resolver = null;// FIXME: this is not implemented yet. // DesignerPropertyTool.getModel().getResolver(); - if (textValue != null && textValue.length() > 0) { - return resolver.getLocationByURI(textValue); - } + //if (textValue != null && textValue.length() > 0) { + // return resolver.getLocationByURI(textValue); + //} return ""; } @@ -120,7 +121,7 @@ public class CSSHtmlListStyleData { } else if (type.equalsIgnoreCase(ICSSPropertyID.VAL_IMAGE)) { return LIST_T_IMAGE; } - ; + return 0; } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/list/CounterHelper.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/list/CounterHelper.java index 6519846bf..6f7ab71c1 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/list/CounterHelper.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/list/CounterHelper.java @@ -199,7 +199,7 @@ public class CounterHelper { String display = style.getDisplay(); Object styleType = style .getStyleProperty(ICSSPropertyID.ATTR_LIST_STYLE_TYPE); - return (((String) display) + return (display .equalsIgnoreCase(ICSSPropertyID.VAL_LIST_ITEM) // && styleType instanceof String // && !CounterValueGenerator.NON_STRING_TYPES.contains(styleType)); @@ -214,9 +214,8 @@ public class CounterHelper { .getStyleProperty(ICSSPropertyID.ATTR_LIST_STYLE_TYPE); if (type instanceof String) { return toTypeInt((String) type); - } else { - return -1; } + return -1; } public static int toTypeInt(String type) { diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/list/CounterValueGenerator.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/list/CounterValueGenerator.java index 8721b4bde..a13399e94 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/list/CounterValueGenerator.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/list/CounterValueGenerator.java @@ -54,7 +54,7 @@ public class CounterValueGenerator implements ICounterValueGenerator { STRING_TYPES.add("katakana"); STRING_TYPES.add("hiragana-iroha"); STRING_TYPES.add("katakana-iroha"); - }; + } private final static int DEFAULT_INCREMENT = 1; @@ -93,7 +93,6 @@ public class CounterValueGenerator implements ICounterValueGenerator { * @see org.w3c.dom.css.Counter#getIdentifier() */ public String getIdentifier() { - // TODO Auto-generated method stub return _identifier; } @@ -103,7 +102,6 @@ public class CounterValueGenerator implements ICounterValueGenerator { * @see org.w3c.dom.css.Counter#getListStyle() */ public String getListStyle() { - // TODO Auto-generated method stub return _styleType; } @@ -113,7 +111,6 @@ public class CounterValueGenerator implements ICounterValueGenerator { * @see org.w3c.dom.css.Counter#getSeparator() */ public String getSeparator() { - // TODO Auto-generated method stub return _seperator; } @@ -322,10 +319,9 @@ public class CounterValueGenerator implements ICounterValueGenerator { public int getInitial() { if (HTMLListInfoHelper.getStartInt(_style) != null) { return HTMLListInfoHelper.getStartInt(_style).intValue(); - } else { - return _initial != null ? _initial.intValue() - : DEFAULT_INITIAL_VALUE; } + return _initial != null ? _initial.intValue() + : DEFAULT_INITIAL_VALUE; } /* diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/marker/DecimalCounter.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/marker/DecimalCounter.java index d74adbda4..4e8c88f06 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/marker/DecimalCounter.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/marker/DecimalCounter.java @@ -18,7 +18,7 @@ import org.eclipse.jst.pagedesigner.css2.list.CSSHtmlListStyleData; */ public class DecimalCounter extends EnumerableCounter { protected DecimalCounter() { - + // do nothing; restrict construction to child classes } /* @@ -27,7 +27,7 @@ public class DecimalCounter extends EnumerableCounter { * @see org.eclipse.jst.pagedesigner.css2.list.EnumerableCounter#getString(int) */ public String getNextString(int index, int type) { - String result; + //String result; switch (type) { case CSSHtmlListStyleData.LIST_T_DECIMAL: return Integer.toString(index); diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/marker/RomanCounter.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/marker/RomanCounter.java index a017abab3..b9e9c41ea 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/marker/RomanCounter.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/marker/RomanCounter.java @@ -18,7 +18,7 @@ import org.eclipse.jst.pagedesigner.css2.list.CSSHtmlListStyleData; */ public class RomanCounter extends EnumerableCounter { protected RomanCounter() { - + // do nothing; restrict construction to sub-classes } /* @@ -46,7 +46,7 @@ public class RomanCounter extends EnumerableCounter { public String getString(int index) { // FIXME: Need to enhance more. StringBuffer roman = new StringBuffer(); - int a, b, c, d, e; + int a, b, c, d; a = (index / 1000) * 1000; b = ((index / 100) % 10) * 100; c = ((index / 10) % 10) * 10; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/BackgroundColorMeta.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/BackgroundColorMeta.java index 9b304d70a..d2674e65b 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/BackgroundColorMeta.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/BackgroundColorMeta.java @@ -44,9 +44,8 @@ public class BackgroundColorMeta extends CSSPropertyMeta { Object result = CSSColorManager.getInstance().getColor(text); if (result != null) { return result; - } else { - return getInitialValue(propertyName, style); } + return getInitialValue(propertyName, style); } /* diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/BorderColorMeta.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/BorderColorMeta.java index 16aeccb98..e91fdbfd8 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/BorderColorMeta.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/BorderColorMeta.java @@ -46,9 +46,8 @@ public class BorderColorMeta extends CSSPropertyMeta { Object result = CSSColorManager.getInstance().getColor(text); if (result != null) { return result; - } else { - return getInitialValue(propertyName, style); } + return getInitialValue(propertyName, style); } /* diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/BorderSpacingMeta.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/BorderSpacingMeta.java index f5bf6735d..601ec79e8 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/BorderSpacingMeta.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/BorderSpacingMeta.java @@ -63,9 +63,8 @@ public class BorderSpacingMeta extends CSSPropertyMeta { int intvalue = toIntValue(value.getCssText(), style); if (intvalue >= 0) { return new int[] { intvalue, intvalue }; - } else { - return INITIAL_SPACING; } + return INITIAL_SPACING; } else if (value.getCssValueType() == CSSValue.CSS_VALUE_LIST) { CSSValueList list = (CSSValueList) value; if (list.getLength() >= 2) { @@ -78,9 +77,8 @@ public class BorderSpacingMeta extends CSSPropertyMeta { i2 = 0; } return new int[] { i1, i2 }; - } else { - return INITIAL_SPACING; } + return INITIAL_SPACING; } else { return INITIAL_SPACING; } @@ -115,8 +113,7 @@ public class BorderSpacingMeta extends CSSPropertyMeta { style.getCSSFont()); if (length instanceof Length && !((Length) length).isPercentage()) { return ((Length) length).getValue(); - } else { - return Integer.MIN_VALUE; } + return Integer.MIN_VALUE; } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/BorderStyleMeta.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/BorderStyleMeta.java index 7dcf7ff53..e71ff7608 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/BorderStyleMeta.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/BorderStyleMeta.java @@ -104,20 +104,16 @@ public class BorderStyleMeta extends CSSPropertyMeta { if (rules == null || rules.length() == 0) { if (borderstr == null || "0".equals(borderstr.trim())) { return ICSSPropertyID.VAL_NONE; - } else { - return ICSSPropertyID.VAL_TDBORDERSTYLE; - } - } else { - // ok, we got a value for rules - if (TableUtil.matchRules(extractEdge(propertyName), rules)) { - return ICSSPropertyID.VAL_TDBORDERSTYLE; - } else { - return ICSSPropertyID.VAL_NONE; } + return ICSSPropertyID.VAL_TDBORDERSTYLE; } - } else { - return null; + // ok, we got a value for rules + if (TableUtil.matchRules(extractEdge(propertyName), rules)) { + return ICSSPropertyID.VAL_TDBORDERSTYLE; + } + return ICSSPropertyID.VAL_NONE; } + return null; } /** @@ -151,9 +147,8 @@ public class BorderStyleMeta extends CSSPropertyMeta { // ok, we got a value for frame. if (TableUtil.matchFrame(extractEdge(propertyName), frame)) { return ICSSPropertyID.VAL_OUTSET; - } else { - return ICSSPropertyID.VAL_NONE; } + return ICSSPropertyID.VAL_NONE; } static String extractEdge(String propertyName) { diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/BorderWidthMeta.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/BorderWidthMeta.java index d60ca7291..8de7cf289 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/BorderWidthMeta.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/BorderWidthMeta.java @@ -139,20 +139,16 @@ public class BorderWidthMeta extends LengthMeta { if (rules == null || rules.length() == 0) { if (borderstr == null || "0".equals(borderstr.trim())) { return null; - } else { - return Length.LENGTH_1; - } - } else { - // ok, we got a value for rules - if (TableUtil.matchRules(extractEdge(propertyName), rules)) { - return Length.LENGTH_1; - } else { - return Length.LENGTH_0; } + return Length.LENGTH_1; } - } else { - return Length.LENGTH_0; + // ok, we got a value for rules + if (TableUtil.matchRules(extractEdge(propertyName), rules)) { + return Length.LENGTH_1; + } + return Length.LENGTH_0; } + return Length.LENGTH_0; } /** @@ -190,9 +186,8 @@ public class BorderWidthMeta extends LengthMeta { } } return Length.LENGTH_1; - } else { - return Length.LENGTH_0; } + return Length.LENGTH_0; } static String extractEdge(String propertyName) { diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/CSSPropertyMeta.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/CSSPropertyMeta.java index c19b44178..110b9947b 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/CSSPropertyMeta.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/CSSPropertyMeta.java @@ -118,8 +118,7 @@ public abstract class CSSPropertyMeta implements ICSSPropertyMeta { String s = checkKeywordValues(value.getCssText()); if (s != null) { return s; - } else { - return this.getInitialValue(propertyName, style); } + return this.getInitialValue(propertyName, style); } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/ColorPropertyMeta.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/ColorPropertyMeta.java index 098555a43..776b1ce65 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/ColorPropertyMeta.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/ColorPropertyMeta.java @@ -62,9 +62,8 @@ public class ColorPropertyMeta extends CSSPropertyMeta { Object result = CSSColorManager.getInstance().getColor(text); if (result != null) { return result; - } else { - return this.getInitialValue(propertyName, style); } + return this.getInitialValue(propertyName, style); } /* diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/CounterIncrementMeta.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/CounterIncrementMeta.java index 0f9b525ec..c6e2012a4 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/CounterIncrementMeta.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/CounterIncrementMeta.java @@ -70,16 +70,15 @@ public class CounterIncrementMeta extends CSSPropertyMeta { } if (cssValue == null) { return null; - } else { - // identifier: - identifier = ((ICSSPrimitiveValue) value).getStringValue(); - cssValue = cssValue.getNextSibling(); - // value: - if (CounterHelper.isNumber(cssValue)) { - increment = new Integer((int) ((ICSSPrimitiveValue) value) - .getFloatValue(ICSSPrimitiveValue.CSS_INTEGER)); - } } + // identifier: + identifier = ((ICSSPrimitiveValue) value).getStringValue(); + cssValue = cssValue.getNextSibling(); + // value: + if (CounterHelper.isNumber(cssValue)) { + increment = new Integer((int) ((ICSSPrimitiveValue) value) + .getFloatValue(ICSSPrimitiveValue.CSS_INTEGER)); + } if (identifier != null) { incrementObject = new IncrementObject(identifier, increment); diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/CounterResetMeta.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/CounterResetMeta.java index 251442f13..a362774ab 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/CounterResetMeta.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/CounterResetMeta.java @@ -67,16 +67,15 @@ public class CounterResetMeta extends CSSPropertyMeta { } if (cssValue == null) { return null; - } else { - // identifier: - identifier = ((ICSSPrimitiveValue) value).getStringValue(); - cssValue = cssValue.getNextSibling(); - // value: - if (CounterHelper.isNumber(cssValue)) { - initial = new Integer((int) ((ICSSPrimitiveValue) value) - .getFloatValue(ICSSPrimitiveValue.CSS_INTEGER)); - } } + // identifier: + identifier = ((ICSSPrimitiveValue) value).getStringValue(); + cssValue = cssValue.getNextSibling(); + // value: + if (CounterHelper.isNumber(cssValue)) { + initial = new Integer((int) ((ICSSPrimitiveValue) value) + .getFloatValue(ICSSPrimitiveValue.CSS_INTEGER)); + } if (identifier != null) { resetObject = new ResetObject(identifier, initial); diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/DisplayMeta.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/DisplayMeta.java index 553a257fa..c72f9276b 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/DisplayMeta.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/DisplayMeta.java @@ -63,8 +63,7 @@ public class DisplayMeta extends CSSPropertyMeta { String key = this.checkKeywordValues(text); if (key != null) return key; - else - return ICSSPropertyID.VAL_INLINE; + return ICSSPropertyID.VAL_INLINE; } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/FontFamilyMeta.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/FontFamilyMeta.java index c8e4fb3f2..68cfc8b47 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/FontFamilyMeta.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/FontFamilyMeta.java @@ -72,7 +72,7 @@ public class FontFamilyMeta extends CSSPropertyMeta { if (value.getCssValueType() == CSSValue.CSS_VALUE_LIST) { CSSValueList valueList = (CSSValueList) value; for (int i = 0, count = valueList.getLength(); i < count; i++) { - String name = ((CSSValue) valueList.item(i)).getCssText(); + String name = valueList.item(i).getCssText(); name = trimPadding(name); if (isSupportedFont(name)) { return name; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/FontSizeMeta.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/FontSizeMeta.java index 2b98b0485..774204ba9 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/FontSizeMeta.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/FontSizeMeta.java @@ -181,8 +181,6 @@ public class FontSizeMeta extends LengthMeta { // _log.error("Error.FontSizeMeta.0", ex); //$NON-NLS-1$ return null; } - } else { - return null; } } return null; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/TextDecorationMeta.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/TextDecorationMeta.java index 19833a15d..05b10a4db 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/TextDecorationMeta.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/TextDecorationMeta.java @@ -67,7 +67,7 @@ public class TextDecorationMeta extends CSSPropertyMeta { CSSValueList valueList = (CSSValueList) value; decorations = new String[valueList.getLength()]; for (int i = 0; i < decorations.length; i++) { - decorations[i] = ((CSSValue) valueList.item(i)).getCssText(); + decorations[i] = valueList.item(i).getCssText(); } } else { decorations = new String[1]; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/style/AbstractStyle.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/style/AbstractStyle.java index 706cb118a..6d2d4b3bf 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/style/AbstractStyle.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/style/AbstractStyle.java @@ -243,9 +243,8 @@ public class AbstractStyle implements ICSSStyle { CSSValue value, String propertyName) { if (meta == null) { return ICSSPropertyMeta.NOT_SPECIFIED; - } else { - return meta.calculateCSSValueResult(value, propertyName, this); } + return meta.calculateCSSValueResult(value, propertyName, this); } /** @@ -306,9 +305,8 @@ public class AbstractStyle implements ICSSStyle { .getAdapterFor(ICSSStyle.class); if (parentStyle != null) { return parentStyle; - } else { - node = node.getParentNode(); } + node = node.getParentNode(); } return DefaultStyle.getInstance(); } @@ -338,6 +336,7 @@ public class AbstractStyle implements ICSSStyle { * @see org.eclipse.jst.pagedesigner.css2.ICSSStyle#dispose() */ public void dispose() { + // TODO: anything to dispose? } /* @@ -398,9 +397,8 @@ public class AbstractStyle implements ICSSStyle { Length l = (Length) obj; if (l.isPercentage()) { return 0; // FIXME: - } else { - return l.getValue(); } + return l.getValue(); } return 0; @@ -435,6 +433,7 @@ public class AbstractStyle implements ICSSStyle { */ public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) { + // do nothing } /* @@ -514,9 +513,8 @@ public class AbstractStyle implements ICSSStyle { return ICSSPropertyID.VAL_INLINE_BLOCK; } return displayStr; - } else { - return displayStr; } + return displayStr; } /* @@ -584,9 +582,8 @@ public class AbstractStyle implements ICSSStyle { // colume if (colspan < 0) { return 1; - } else { - return colspan; } + return colspan; } /* @@ -599,9 +596,8 @@ public class AbstractStyle implements ICSSStyle { "rowspan", 1); if (rowspan < 0) { return 1; - } else { - return rowspan; } + return rowspan; } /* diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/style/DefaultStyle.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/style/DefaultStyle.java index 70e066065..58ecdbe64 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/style/DefaultStyle.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/style/DefaultStyle.java @@ -35,6 +35,7 @@ public class DefaultStyle implements ICSSStyle { * @see org.eclipse.jst.pagedesigner.css2.ICSSStyle#reset() */ public void reset() { + // TODO: dead? } /* @@ -46,9 +47,8 @@ public class DefaultStyle implements ICSSStyle { ICSSPropertyMeta meta = CSSMetaRegistry.getInstance().getMeta(property); if (meta == null) { return ICSSPropertyMeta.NOT_SPECIFIED; - } else { - return meta.getInitialValue(property, this); } + return meta.getInitialValue(property, this); } /* @@ -93,6 +93,7 @@ public class DefaultStyle implements ICSSStyle { * @see org.eclipse.jst.pagedesigner.css2.ICSSStyle#dispose() */ public void dispose() { + // TODO: anything to dispose } /* @@ -112,9 +113,10 @@ public class DefaultStyle implements ICSSStyle { */ public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) { + // TODO: do nothing? } - ICSSFont defaultFont = CSSFontManager.getInstance().createDefaultFont(); + private ICSSFont defaultFont = CSSFontManager.getInstance().createDefaultFont(); /* * (non-Javadoc) @@ -248,8 +250,7 @@ public class DefaultStyle implements ICSSStyle { propertyName); if (meta == null) { return ICSSPropertyMeta.NOT_SPECIFIED; - } else { - return meta.getInitialValue(propertyName, this); } + return meta.getInitialValue(propertyName, this); } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/style/ImageStyleHelper.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/style/ImageStyleHelper.java index 9e5240046..6072010de 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/style/ImageStyleHelper.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/style/ImageStyleHelper.java @@ -24,6 +24,7 @@ public class ImageStyleHelper { public static Image loadImage(String url, Element source) { if (source instanceof IDOMElement) { IDOMModel model = ((IDOMElement) source).getModel(); + // TODO: the new resolver is not compatible with model URIResolver resolver = model.getResolver(); if (resolver != null) url = resolver.getLocationByURI(url); diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/widget/ButtonWidgetProvider.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/widget/ButtonWidgetProvider.java index 3627f72f7..e4a8ed8a1 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/widget/ButtonWidgetProvider.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/widget/ButtonWidgetProvider.java @@ -11,8 +11,6 @@ *******************************************************************************/ package org.eclipse.jst.pagedesigner.css2.widget; -import java.util.ArrayList; -import java.util.List; import java.util.StringTokenizer; import org.eclipse.draw2d.ColorConstants; @@ -56,7 +54,7 @@ public class ButtonWidgetProvider extends AbstractWidgetProvider { private String[] _lines = DEFAULTLINES; - private List _fragments = new ArrayList(); +// private List _fragments = new ArrayList(); /** * @param style diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/widget/ComboWidgetProvider.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/widget/ComboWidgetProvider.java index 5a4926668..cd8720f29 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/widget/ComboWidgetProvider.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/widget/ComboWidgetProvider.java @@ -37,7 +37,7 @@ public class ComboWidgetProvider extends AbstractWidgetProvider { private static int ARRAWWIDTH = 16; - private static int ARROWHEIGHT = 16; + //private static int ARROWHEIGHT = 16; private String _firstString; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/DesignerSourceMouseTrackAdapter.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/DesignerSourceMouseTrackAdapter.java index cf5e7bd36..20ed0fe32 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/DesignerSourceMouseTrackAdapter.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/DesignerSourceMouseTrackAdapter.java @@ -85,14 +85,13 @@ public class DesignerSourceMouseTrackAdapter extends _domain.getPaletteViewer().setActiveTool(null); } return; - } else { - SourceViewerCommand command = getCommand(event); - if (command != null) { - command.execute(); - resetPalette(); - } - _location = 0; } + SourceViewerCommand command = getCommand(event); + if (command != null) { + command.execute(); + resetPalette(); + } + _location = 0; } /* @@ -118,6 +117,7 @@ public class DesignerSourceMouseTrackAdapter extends * @see org.eclipse.swt.events.MouseListener#mouseDoubleClick(org.eclipse.swt.events.MouseEvent) */ public void mouseDoubleClick(MouseEvent e) { + // do nothing } /* @@ -126,6 +126,7 @@ public class DesignerSourceMouseTrackAdapter extends * @see org.eclipse.swt.events.MouseListener#mouseDown(org.eclipse.swt.events.MouseEvent) */ public void mouseDown(MouseEvent e) { + // do nothing } private PaletteDropInsertCommand getCommand(MouseEvent event) { @@ -149,7 +150,7 @@ public class DesignerSourceMouseTrackAdapter extends ToolEntry tool = _domain.getPaletteViewer().getPaletteRoot() .getDefaultEntry(); if (tool != null) { - _domain.getPaletteViewer().setActiveTool((ToolEntry) tool); + _domain.getPaletteViewer().setActiveTool(tool); } } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/DropSelectionWizard.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/DropSelectionWizard.java index 76c026a93..344ea07bd 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/DropSelectionWizard.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/DropSelectionWizard.java @@ -103,12 +103,12 @@ public class DropSelectionWizard extends Wizard { if (getContainer().getCurrentPage() == _firstPage) { Object obj = _firstPage.getCurrentHandler(); if (obj instanceof ILocalDropHandler) + { return true; - else - return false; - } else { - return super.canFinish(); + } + return false; } + return super.canFinish(); } /* diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/LocalDropCommand.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/LocalDropCommand.java index ce6f6db1a..223ff1d8c 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/LocalDropCommand.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/LocalDropCommand.java @@ -110,10 +110,9 @@ public class LocalDropCommand extends Command { if (_widget != null) { return new DropSelectionWizard(_viewer, _localObject, _feedbackToHandlers, _widget); - } else { - return new DropSelectionWizard(_viewer, _localObject, - _feedbackToHandlers, _position); } + return new DropSelectionWizard(_viewer, _localObject, + _feedbackToHandlers, _position); } /** diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/Messages.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/Messages.java index 0e6af8a08..ade06ab7c 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/Messages.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/Messages.java @@ -21,10 +21,10 @@ public class Messages { .getBundle(BUNDLE_NAME); private Messages() { + // no external instantiation } public static String getString(String key) { - // TODO Auto-generated method stub try { return RESOURCE_BUNDLE.getString(key); } catch (MissingResourceException e) { diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/SimpleWizardSelectionPage.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/SimpleWizardSelectionPage.java index a608b59ec..c19ebc7f4 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/SimpleWizardSelectionPage.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/SimpleWizardSelectionPage.java @@ -120,10 +120,12 @@ public class SimpleWizardSelectionPage extends WizardSelectionPage implements } public void dispose() { + // nothing to dispose } public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + // no input changing } }); listViewer.setLabelProvider(new LabelProvider() { @@ -183,6 +185,7 @@ public class SimpleWizardSelectionPage extends WizardSelectionPage implements IWizard _wizard = null; public void dispose() { + // nothing to dispose } public Point getExtent() { @@ -206,9 +209,8 @@ public class SimpleWizardSelectionPage extends WizardSelectionPage implements return _wizard != null; } }; - } else { - return dropHandler; } + return dropHandler; } /** diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/SourceViewerDragDropHelper.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/SourceViewerDragDropHelper.java index 70d673c3c..17d8c353b 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/SourceViewerDragDropHelper.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/SourceViewerDragDropHelper.java @@ -82,6 +82,7 @@ public class SourceViewerDragDropHelper { lineInfo = ste.getTextViewer().getDocument() .getLineInformationOfOffset(offset); } catch (BadLocationException e1) { + // ignore exception and fall-through with lineInfo == null } if (lineInfo != null) offset = lineInfo.getOffset() @@ -203,9 +204,8 @@ public class SourceViewerDragDropHelper { protected ModelQuery getModelQuery(Node node) { if (node.getNodeType() == Node.DOCUMENT_NODE) { return ModelQueryUtil.getModelQuery((Document) node); - } else { - return ModelQueryUtil.getModelQuery(node.getOwnerDocument()); } + return ModelQueryUtil.getModelQuery(node.getOwnerDocument()); } public IDOMPosition findPosition(int caretPos, Node element) { @@ -298,6 +298,7 @@ public class SourceViewerDragDropHelper { * IExtendedMarkupEditor method */ public Node getCaretNode(StructuredTextEditor textEditor, int pos) { + // TODO: getModel is deprecated IStructuredModel model = textEditor.getModel(); // getModel(textEditor); if (model == null) { @@ -329,15 +330,13 @@ public class SourceViewerDragDropHelper { } else if (pos[0][0] <= location && pos[0][1] >= location) { if (((pos[0][1] + pos[0][0]) / 2) >= location) { return pos[0][0]; - } else { - return pos[0][1]; } + return pos[0][1]; } else if (pos[1][0] <= location && pos[1][1] >= location) { if (((pos[1][1] + pos[1][0]) / 2) >= location) { return pos[1][0]; - } else { - return pos[1][1]; } + return pos[1][1]; } return location; } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/CaretMoveIterator.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/CaretMoveIterator.java index 188e85918..c50ae4fc4 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/CaretMoveIterator.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/CaretMoveIterator.java @@ -256,8 +256,7 @@ public class CaretMoveIterator { private Node getNaviContainer(IDOMPosition position) { if (position.isText()) { return position.getContainerNode().getParentNode(); - } else { - return position.getContainerNode(); } + return position.getContainerNode(); } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/DOMPosition.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/DOMPosition.java index 1c340bd2a..ee50acdf1 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/DOMPosition.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/DOMPosition.java @@ -11,7 +11,6 @@ *******************************************************************************/ package org.eclipse.jst.pagedesigner.dom; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode; import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.w3c.dom.Text; @@ -54,8 +53,7 @@ public class DOMPosition implements IDOMPosition { int length = children.getLength(); if (_offset >= length || _offset < 0) return null; - else - return (IDOMNode) children.item(_offset); + return children.item(_offset); } /* @@ -70,8 +68,7 @@ public class DOMPosition implements IDOMPosition { int length = children.getLength(); if (_offset > length || _offset <= 0) return null; - else - return (IDOMNode) children.item(_offset - 1); + return children.item(_offset - 1); } /* @@ -100,16 +97,14 @@ public class DOMPosition implements IDOMPosition { public Node getSibling(boolean forward) { if (forward) return getNextSiblingNode(); - else - return getPreviousSiblingNode(); + return getPreviousSiblingNode(); } public IDOMPosition handleReplacement(Node original, Node replacement) { if (original == this._containerNode) { return new DOMPosition(replacement, this._offset); - } else { - return this; } + return this; } /* diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/DOMPositionHelper.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/DOMPositionHelper.java index e1f116dac..007def86f 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/DOMPositionHelper.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/DOMPositionHelper.java @@ -37,12 +37,10 @@ public class DOMPositionHelper { EditPart child = DOMPositionHelper.findEditPart(part, node); if (child != null) { return new DesignRefPosition(child, position.isForward()); - } else { - return DesignPosition.INVALID; } - } else { - node = node.getParentNode(); + return DesignPosition.INVALID; } + node = node.getParentNode(); } while (true); } @@ -69,21 +67,19 @@ public class DOMPositionHelper { return new DesignPosition(part, textDataOffsetToDisplayOffset(textData, displayData, position.getOffset())); - } else { - Node pre = position.getPreviousSiblingNode(); - while (pre != null) { - int index = findChildEditPartIndex(part, pre); - if (index != -1) { - return new DesignPosition(part, index + 1); - } - pre = pre.getPreviousSibling(); - } - return new DesignPosition(part, 0); } - } else { - position = new DOMRefPosition(position.getContainerNode(), - false); + Node pre = position.getPreviousSiblingNode(); + while (pre != null) { + int index = findChildEditPartIndex(part, pre); + if (index != -1) { + return new DesignPosition(part, index + 1); + } + pre = pre.getPreviousSibling(); + } + return new DesignPosition(part, 0); } + position = new DOMRefPosition(position.getContainerNode(), + false); } while (true); } @@ -108,20 +104,18 @@ public class DOMPositionHelper { return new DesignPosition(part, textDataOffsetToDisplayOffset(textData, displayData, position.getOffset())); - } else { - Node pre = position.getPreviousSiblingNode(); - while (pre != null) { - int index = findChildEditPartIndex(part, pre); - if (index != -1) { - return new DesignPosition(part, index + 1); - } - pre = pre.getPreviousSibling(); - } - return new DesignPosition(part, 0); } - } else { - return DesignPosition.INVALID; + Node pre = position.getPreviousSiblingNode(); + while (pre != null) { + int index = findChildEditPartIndex(part, pre); + if (index != -1) { + return new DesignPosition(part, index + 1); + } + pre = pre.getPreviousSibling(); + } + return new DesignPosition(part, 0); } + return DesignPosition.INVALID; } while (true); } @@ -182,35 +176,32 @@ public class DOMPositionHelper { int offset = position.getOffset(); if (offset == 0) { return new DOMPosition(text, 0); - } else { - String displayData = ((TextEditPart) part).getTextData(); - String nodeData = text.getData(); - if (offset >= displayData.length()) { - // point to end of the text node. - return new DOMPosition(text, nodeData.length()); - } else { - // we need to calculate it out. - int index = displayOffsetToTextDataOffset(displayData, - nodeData, offset); - return new DOMPosition(text, index); - } - } - } else { - // ok, it is not text. - EditPart sibling = position.getSiblingEditPart(true); - if (sibling != null) { - return new DOMRefPosition((Node) sibling.getModel(), false); } + String displayData = ((TextEditPart) part).getTextData(); + String nodeData = text.getData(); + if (offset >= displayData.length()) { + // point to end of the text node. + return new DOMPosition(text, nodeData.length()); + } + // we need to calculate it out. + int index = displayOffsetToTextDataOffset(displayData, + nodeData, offset); + return new DOMPosition(text, index); + } + // ok, it is not text. + EditPart sibling = position.getSiblingEditPart(true); + if (sibling != null) { + return new DOMRefPosition((Node) sibling.getModel(), false); + } - sibling = position.getSiblingEditPart(false); - if (sibling != null) { - return new DOMRefPosition((Node) sibling.getModel(), true); - } + sibling = position.getSiblingEditPart(false); + if (sibling != null) { + return new DOMRefPosition((Node) sibling.getModel(), true); + } - // no previous sibling, no next sibling, the parent node must be - // empty - return new DOMPosition((Node) part.getModel(), 0); - } + // no previous sibling, no next sibling, the parent node must be + // empty + return new DOMPosition((Node) part.getModel(), 0); } /** @@ -238,8 +229,8 @@ public class DOMPositionHelper { // ok, we need split ((Text) container).splitText(offset); return new DOMRefPosition(container, true); - } else - return position; + } + return position; } /** @@ -250,8 +241,8 @@ public class DOMPositionHelper { */ public static IDOMPosition removeRange(DOMRange range) { boolean ordered = range.isOrdered(); - IDOMPosition start = ordered ? range.getStartPosition() : range - .getEndPosition(); +// IDOMPosition start = ordered ? range.getStartPosition() : range +// .getEndPosition(); IDOMPosition end = ordered ? range.getEndPosition() : range .getStartPosition(); @@ -312,11 +303,10 @@ public class DOMPositionHelper { nodeIndex++; } continue; - } else { - // should not happen! - displayIndex++; - nodeIndex++; } + // should not happen! + displayIndex++; + nodeIndex++; } if (nodeIndex >= nodeDataLength) @@ -367,11 +357,10 @@ public class DOMPositionHelper { nodeIndex++; } continue; - } else { - // should not happen! - displayIndex++; - nodeIndex++; } + // should not happen! + displayIndex++; + nodeIndex++; } return displayIndex; } @@ -395,8 +384,7 @@ public class DOMPositionHelper { } if (position.getPreviousSiblingNode() != null) { return new DOMRefPosition(position.getPreviousSiblingNode(), true); - } else { - return new DOMRefPosition2(position.getContainerNode(), true); } + return new DOMRefPosition2(position.getContainerNode(), true); } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/DOMRangeHelper.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/DOMRangeHelper.java index 238c5bb90..fcc8fb974 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/DOMRangeHelper.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/DOMRangeHelper.java @@ -24,10 +24,10 @@ public class DOMRangeHelper { IDOMPosition dp = DOMPositionHelper.toDOMPosition(range .getStartPosition()); return new DOMRange(dp, dp); - } else - return new DOMRange(DOMPositionHelper.toDOMPosition(range - .getStartPosition()), DOMPositionHelper.toDOMPosition(range - .getEndPosition())); + } + return new DOMRange(DOMPositionHelper.toDOMPosition(range + .getStartPosition()), DOMPositionHelper.toDOMPosition(range + .getEndPosition())); } public static DesignRange toDesignRange(DOMRange range) { @@ -47,10 +47,9 @@ public class DOMRangeHelper { IDOMPosition pos = range.getStartPosition().handleReplacement( original, replacement); return new DOMRange(pos, pos); - } else { - return new DOMRange(range.getStartPosition().handleReplacement( - original, replacement), range.getEndPosition() - .handleReplacement(original, replacement)); } + return new DOMRange(range.getStartPosition().handleReplacement( + original, replacement), range.getEndPosition() + .handleReplacement(original, replacement)); } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/DOMRefPosition.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/DOMRefPosition.java index 480a4d969..b82e1453b 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/DOMRefPosition.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/DOMRefPosition.java @@ -44,11 +44,14 @@ public class DOMRefPosition implements IDOMRefPosition { */ public Node getSibling(boolean forward) { if (forward != _forward) - return _refNode; + { + return _refNode; + } if (forward) + { return _refNode.getNextSibling(); - else - return _refNode.getPreviousSibling(); + } + return _refNode.getPreviousSibling(); } /* @@ -87,16 +90,15 @@ public class DOMRefPosition implements IDOMRefPosition { Node parent = _refNode.getParentNode(); if (parent == null) { return _forward ? 1 : 0; - } else { - NodeList list = parent.getChildNodes(); - for (int i = 0, n = list.getLength(); i < n; i++) { - if (list.item(i) == _refNode) { - return _forward ? (i + 1) : i; - } - } - // should not happen. - return -1; } + NodeList list = parent.getChildNodes(); + for (int i = 0, n = list.getLength(); i < n; i++) { + if (list.item(i) == _refNode) { + return _forward ? (i + 1) : i; + } + } + // should not happen. + return -1; } /* @@ -111,9 +113,8 @@ public class DOMRefPosition implements IDOMRefPosition { public IDOMPosition handleReplacement(Node original, Node replacement) { if (this._refNode == original) { return new DOMRefPosition(replacement, this._forward); - } else { - return this; } + return this; } /* diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/DOMRefPosition2.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/DOMRefPosition2.java index 100428cd3..b037fbc6e 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/DOMRefPosition2.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/DOMRefPosition2.java @@ -52,16 +52,13 @@ public class DOMRefPosition2 implements IDOMRefPosition { if (forward) { if (_last) { return null; - } else { - return _parentNode.getFirstChild(); } - } else { - if (_last) { - return _parentNode.getLastChild(); - } else { - return null; - } - } + return _parentNode.getFirstChild(); + } else if (_last) { + return _parentNode.getLastChild(); + } else { + return null; + } } /* @@ -99,9 +96,8 @@ public class DOMRefPosition2 implements IDOMRefPosition { public int getOffset() { if (!_last) { return 0; - } else { - return _parentNode.getChildNodes().getLength(); } + return _parentNode.getChildNodes().getLength(); } /* @@ -122,8 +118,8 @@ public class DOMRefPosition2 implements IDOMRefPosition { public IDOMPosition handleReplacement(Node original, Node replacement) { if (original == _parentNode) { return new DOMRefPosition2(replacement, _last); - } else - return this; + } + return this; } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/DOMStyleUtil.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/DOMStyleUtil.java index 66a0c2d17..6a4fc2ace 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/DOMStyleUtil.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/DOMStyleUtil.java @@ -165,9 +165,8 @@ public class DOMStyleUtil { CMElementDeclaration decl = CMUtil.getElementDeclaration(ele); if (decl != null && decl.getAttributes().getNamedItem("style") != null) { return true; - } else { - return false; } + return false; } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/DOMUtil.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/DOMUtil.java index 205f2575a..8aa249abd 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/DOMUtil.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/DOMUtil.java @@ -44,9 +44,8 @@ public class DOMUtil { list.add(node); if (node instanceof Document) { break; - } else { - node = node.getParentNode(); } + node = node.getParentNode(); } if (node == null) { // if part ==null, means we didn't find a DocumentEditPart, diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/EditHelper.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/EditHelper.java index 2c91d3eab..6c4a6fa03 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/EditHelper.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/EditHelper.java @@ -17,9 +17,7 @@ import java.util.Stack; import org.eclipse.gef.EditPart; import org.eclipse.jface.text.Assert; import org.eclipse.jst.pagedesigner.IHTMLConstants; -import org.eclipse.jst.pagedesigner.PDPlugin; import org.eclipse.jst.pagedesigner.commands.range.WorkNode; -import org.eclipse.jst.pagedesigner.common.logging.Logger; import org.eclipse.jst.pagedesigner.parts.TextEditPart; import org.eclipse.jst.pagedesigner.utils.HTMLUtil; import org.eclipse.jst.pagedesigner.validation.caret.ActionData; @@ -52,9 +50,10 @@ public class EditHelper { public static final EditHelper _instance = new EditHelper(); - private static Logger _log = PDPlugin.getLogger(EditHelper.class); + //private static Logger _log = PDPlugin.getLogger(EditHelper.class); private EditHelper() { + // no external instantiation } /** @@ -186,9 +185,8 @@ public class EditHelper { if (EditModelQuery.getIndexedRegionLocation(p1) > EditModelQuery .getIndexedRegionLocation(p2)) { return new DOMRange(p2, p1); - } else { - return range; } + return range; } /** @@ -300,60 +298,61 @@ public class EditHelper { return OUT_OF_RIGHT; } } - } else { - int left = EditModelQuery.getNodeStartIndex(currentNode); - int left1 = EditModelQuery.getNodeStartNameEndIndex(currentNode); - int right = EditModelQuery.getNodeEndNameStartIndex(currentNode); - int right1 = EditModelQuery.getNodeEndIndex(currentNode); - if (isOffset) { - pos += left; - } - if (pos <= left) { - return OUT_OF_LEFT; - } else if (left < pos && pos < left1) { - return LEFT_NAME; - } else if (left1 <= pos && pos <= right) { - return IN_MIDDLE; - } else if (right < pos && pos < right1) { - return RIGHT_NAME; - } else { - return OUT_OF_RIGHT; - } } + int left = EditModelQuery.getNodeStartIndex(currentNode); + int left1 = EditModelQuery.getNodeStartNameEndIndex(currentNode); + int right = EditModelQuery.getNodeEndNameStartIndex(currentNode); + int right1 = EditModelQuery.getNodeEndIndex(currentNode); + if (isOffset) { + pos += left; + } + if (pos <= left) { + return OUT_OF_LEFT; + } else if (left < pos && pos < left1) { + return LEFT_NAME; + } else if (left1 <= pos && pos <= right) { + return IN_MIDDLE; + } else if (right < pos && pos < right1) { + return RIGHT_NAME; + } else { + return OUT_OF_RIGHT; + } } - private Node cutCurrentNode(int pos[], Node currentNode, - IDOMPosition position) { - // at right edge - int curpos = EditModelQuery.getIndexedRegionLocation(position); - if (pos[0] <= curpos) { - pos[1] = EditModelQuery.getNodeStartIndex(currentNode); - currentNode = deleteNode(currentNode); - if (INNER_DEBUG) { - _log.info("cut:" + currentNode); - } - return currentNode; - } else if (pos[1] >= curpos) { - pos[0] = EditModelQuery.getNodeEndIndex(currentNode); - currentNode = deleteNode(currentNode); - if (INNER_DEBUG) { - _log.info("cut:" + currentNode); - } - return currentNode; - } - return null; - } - - private int getPos(DOMRange range, boolean forStart) { - if (forStart) { - return EditModelQuery.getIndexedRegionLocation(range - .getStartPosition()); - } else { - return EditModelQuery.getIndexedRegionLocation(range - .getEndPosition()); - } - } + // TODO: dead? +// private Node cutCurrentNode(int pos[], Node currentNode, +// IDOMPosition position) { +// // at right edge +// int curpos = EditModelQuery.getIndexedRegionLocation(position); +// if (pos[0] <= curpos) { +// pos[1] = EditModelQuery.getNodeStartIndex(currentNode); +// currentNode = deleteNode(currentNode); +// if (INNER_DEBUG) { +// _log.info("cut:" + currentNode); +// } +// return currentNode; +// } else if (pos[1] >= curpos) { +// pos[0] = EditModelQuery.getNodeEndIndex(currentNode); +// currentNode = deleteNode(currentNode); +// if (INNER_DEBUG) { +// _log.info("cut:" + currentNode); +// } +// return currentNode; +// } +// return null; +// } + + //TODO: dead? +// private int getPos(DOMRange range, boolean forStart) { +// if (forStart) { +// return EditModelQuery.getIndexedRegionLocation(range +// .getStartPosition()); +// } else { +// return EditModelQuery.getIndexedRegionLocation(range +// .getEndPosition()); +// } +// } public EditPart getEditPart(DesignPosition position, boolean forward) { if (position instanceof DesignRefPosition) { @@ -435,10 +434,9 @@ public class EditHelper { } } return new DOMRefPosition(newContainer, true); - } else { - // position = new - // DOMRefPosition(position.getContainerNode(), true); } +// position = new +// DOMRefPosition(position.getContainerNode(), true); } } else { // container = position.getContainerNode(); @@ -454,23 +452,19 @@ public class EditHelper { public static int getLocation(IDOMPosition position) { if (position.getOffset() == 0) { return -1; - } else { - if (position.isText()) { - if (position.getOffset() == ((Text) position.getContainerNode()) - .getLength()) { - return 1; - } else { - return 0; - } - } else { - if (position.getOffset() == position.getContainerNode() - .getChildNodes().getLength()) { - return 1; - } else { - return 0; - } - } } + if (position.isText()) { + if (position.getOffset() == ((Text) position.getContainerNode()) + .getLength()) { + return 1; + } + return 0; + } + if (position.getOffset() == position.getContainerNode() + .getChildNodes().getLength()) { + return 1; + } + return 0; } public static EditPart getPart(Node node) { diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/EditModelQuery.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/EditModelQuery.java index 9097433b3..20dbe5059 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/EditModelQuery.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/EditModelQuery.java @@ -31,9 +31,6 @@ import org.eclipse.jst.pagedesigner.parts.ElementEditPart; import org.eclipse.jst.pagedesigner.parts.HTMLEditPartsFactory; import org.eclipse.jst.pagedesigner.parts.NodeEditPart; import org.eclipse.jst.pagedesigner.utils.HTMLUtil; -import org.eclipse.jst.pagedesigner.validation.caret.ActionData; -import org.eclipse.jst.pagedesigner.validation.caret.IMovementMediator; -import org.eclipse.jst.pagedesigner.validation.caret.InlineEditingNavigationMediator; import org.eclipse.jst.pagedesigner.validation.caret.Target; import org.eclipse.jst.pagedesigner.viewer.DesignPosition; import org.eclipse.jst.pagedesigner.viewer.DesignRange; @@ -129,6 +126,7 @@ public class EditModelQuery { } private EditModelQuery() { + // no external instantiation } public static EditModelQuery getInstance() { @@ -211,9 +209,8 @@ public class EditModelQuery { } if (node.getLastChild() != null) { return getLastLeafChild(node.getLastChild()); - } else { - return node; } + return node; } /** @@ -229,9 +226,8 @@ public class EditModelQuery { if (node.getFirstChild() != null) { return getFirstLeafChild(node.getFirstChild()); - } else { - return node; } + return node; } /** @@ -268,9 +264,8 @@ public class EditModelQuery { if (getNodeLenth(theNode) > 0) { return getNodeStartIndex(theNode) >= end || getNodeEndIndex(theNode) <= start; - } else { - return !((getNodeStartIndex(theNode) >= start && getNodeEndIndex(theNode) <= end)); } + return !((getNodeStartIndex(theNode) >= start && getNodeEndIndex(theNode) <= end)); } /** @@ -288,12 +283,10 @@ public class EditModelQuery { if (forward) { if (EditModelQuery.isText(node)) { return offset == node.getNodeValue().length(); - } else { - return offset == node.getChildNodes().getLength(); } - } else { - return offset == 0; + return offset == node.getChildNodes().getLength(); } + return offset == 0; } /** @@ -307,9 +300,8 @@ public class EditModelQuery { public Node getNeighbor(Node node, boolean forward) { if (forward) { return getNextNeighbor(node); - } else { - return getPreviousNeighbor(node); } + return getPreviousNeighbor(node); } /** @@ -367,9 +359,8 @@ public class EditModelQuery { Assert.isTrue(root != null); if (forward) { return getNextNeighbor(node, root); - } else { - return getPreviousNeighbor(node, root); } + return getPreviousNeighbor(node, root); } /** @@ -386,9 +377,8 @@ public class EditModelQuery { } if (forward) { return getNextLeafNeighbor(node); - } else { - return getPreviousLeafNeighbor(node); } + return getPreviousLeafNeighbor(node); } /** @@ -407,9 +397,8 @@ public class EditModelQuery { if (neighbor != null) { if (forward) { return getFirstLeafChild(neighbor); - } else { - return getLastLeafChild(neighbor); } + return getLastLeafChild(neighbor); } return null; } @@ -439,16 +428,13 @@ public class EditModelQuery { childNode = nodeList.item(childIndex); if (childNode != null) { return childNode; - } else { - return getNeighbor(parent, forward); - } - } else { - if (parent.getNodeType() == Node.TEXT_NODE) { - return getNeighbor(parent, forward); - } else { - return null; } + return getNeighbor(parent, forward); } + if (parent.getNodeType() == Node.TEXT_NODE) { + return getNeighbor(parent, forward); + } + return null; } /** @@ -570,39 +556,31 @@ public class EditModelQuery { Node parent = p.getContainerNode(); if (p.isText()) { return ((IndexedRegion) parent).getStartOffset() + p.getOffset(); - } else { - int index = p.getOffset(); - if (!parent.hasChildNodes()) { - // Element: - if (!isDocument(parent)) { - IStructuredDocumentRegion region = ((IDOMNode) parent) - .getStartStructuredDocumentRegion(); - return region.getEnd(); - } - // Document node: - else { - int offset = ((IndexedRegion) parent).getStartOffset(); - return offset; - } - } else { - NodeList children = parent.getChildNodes(); - // After rightmost child - if (children.getLength() == index) { - if (!isDocument(parent)) { - int pos = getNodeEndNameStartIndex(parent); - return pos; - } else { - int offset = ((IndexedRegion) parent).getEndOffset(); - return offset; - } - } - // Before a child - else { - Node node = children.item(index); - return ((IndexedRegion) node).getStartOffset(); - } - } } + int index = p.getOffset(); + if (!parent.hasChildNodes()) { + // Element: + if (!isDocument(parent)) { + IStructuredDocumentRegion region = ((IDOMNode) parent) + .getStartStructuredDocumentRegion(); + return region.getEnd(); + } + // Document node: + int offset = ((IndexedRegion) parent).getStartOffset(); + return offset; + } + NodeList children = parent.getChildNodes(); + // After rightmost child + if (children.getLength() == index) { + if (!isDocument(parent)) { + int pos = getNodeEndNameStartIndex(parent); + return pos; + } + int offset = ((IndexedRegion) parent).getEndOffset(); + return offset; + } + Node node = children.item(index); + return ((IndexedRegion) node).getStartOffset(); } /** @@ -619,19 +597,18 @@ public class EditModelQuery { if (left) { int pos = getIndexedRegionLocation(nodePos); return pos == index; - } else { - Node node = null; - int end; - if (nodePos.isText()) { - node = nodePos.getContainerNode(); - end = ((IndexedRegion) node).getEndOffset(); - } else { - node = nodePos.getNextSiblingNode(); - Assert.isTrue(node != null); - end = ((IndexedRegion) node).getEndOffset(); - } - return end == index; } + Node node = null; + int end; + if (nodePos.isText()) { + node = nodePos.getContainerNode(); + end = ((IndexedRegion) node).getEndOffset(); + } else { + node = nodePos.getNextSiblingNode(); + Assert.isTrue(node != null); + end = ((IndexedRegion) node).getEndOffset(); + } + return end == index; } /** @@ -752,14 +729,13 @@ public class EditModelQuery { i++; } return i; - } else { - i = position - 1; - while (i >= 0 - && (value.charAt(i) == SWT.CR || value.charAt(i) == SWT.LF)) { - i--; - } - return i + 1; } + i = position - 1; + while (i >= 0 + && (value.charAt(i) == SWT.CR || value.charAt(i) == SWT.LF)) { + i--; + } + return i + 1; } /** @@ -974,9 +950,8 @@ public class EditModelQuery { public Node getNextSibling(IDOMPosition position) { if (position.isText()) { return position.getContainerNode().getNextSibling(); - } else { - return position.getNextSiblingNode(); } + return position.getNextSiblingNode(); } /** @@ -988,9 +963,8 @@ public class EditModelQuery { public Node getPreviousSibling(IDOMPosition position) { if (position.isText()) { return position.getContainerNode().getPreviousSibling(); - } else { - return position.getPreviousSiblingNode(); } + return position.getPreviousSiblingNode(); } /** @@ -1002,9 +976,8 @@ public class EditModelQuery { public Node getParent(IDOMPosition position) { if (position.isText()) { return position.getContainerNode().getParentNode(); - } else { - return position.getContainerNode(); } + return position.getContainerNode(); } /** @@ -1018,9 +991,8 @@ public class EditModelQuery { EditValidateUtil.validNode(node); if (forward) { return node.getNextSibling(); - } else { - return node.getPreviousSibling(); } + return node.getPreviousSibling(); } /** @@ -1033,9 +1005,8 @@ public class EditModelQuery { public Node getSibling(IDOMPosition position, boolean forward) { if (forward) { return getNextSibling(position); - } else { - return getPreviousSibling(position); } + return getPreviousSibling(position); } /** @@ -1049,13 +1020,11 @@ public class EditModelQuery { EditValidateUtil.validPosition(position); if (position.isText()) { return ((Text) position.getContainerNode()).getLength(); - } else { - if (position.getContainerNode().hasChildNodes()) { - return position.getContainerNode().getChildNodes().getLength(); - } else { - return 0; - } } + if (position.getContainerNode().hasChildNodes()) { + return position.getContainerNode().getChildNodes().getLength(); + } + return 0; } /** @@ -1118,9 +1087,10 @@ public class EditModelQuery { return node != null && node.getNodeType() == Node.DOCUMENT_NODE; } - private static boolean isHead(Node node) { - return node.getNodeName().equalsIgnoreCase(IHTMLConstants.TAG_HEAD); - } + // TODO: dead? +// private static boolean isHead(Node node) { +// return node.getNodeName().equalsIgnoreCase(IHTMLConstants.TAG_HEAD); +// } /** * Get style from parent node. from first paret 'firstF', we will traverse @@ -1189,17 +1159,15 @@ public class EditModelQuery { if (forward && container.hasChildNodes()) { return new DOMPosition(container, container.getChildNodes() .getLength()); - } else { - return new DOMPosition(container, 0); } - } else { - Assert.isTrue(refNode.getParentNode() == container); - int index = getNodeIndex(refNode); - if (!forward) { - index++; - } - return new DOMPosition(container, index); + return new DOMPosition(container, 0); } + Assert.isTrue(refNode.getParentNode() == container); + int index = getNodeIndex(refNode); + if (!forward) { + index++; + } + return new DOMPosition(container, index); } public static DesignRange convertToDesignRange(IStructuredModel fModel, @@ -1254,8 +1222,9 @@ public class EditModelQuery { public IDOMPosition createDomposition1(IDOMModel model, int position, boolean adjust) { try { - IMovementMediator validator = new InlineEditingNavigationMediator( - new ActionData(ActionData.INLINE_EDIT, null)); + // TODO: never read +// IMovementMediator validator = new InlineEditingNavigationMediator( +// new ActionData(ActionData.INLINE_EDIT, null)); // get the container Object object = getPosNode(model, position); if (object == null && position > 0) { @@ -1312,15 +1281,12 @@ public class EditModelQuery { * @return */ public static int getNodeLenth(Node node) { - if (node == null) { - return 0; - } - if (EditValidateUtil.validNode(node)) { + if (node != null + && EditValidateUtil.validNode(node)) { return ((IndexedRegion) node).getEndOffset() - ((IndexedRegion) node).getStartOffset(); - } else { - return 0; } + return 0; } /** @@ -1454,21 +1420,17 @@ public class EditModelQuery { * @return */ public boolean hasNonTransparentChild(Node node) { - if (!node.hasChildNodes()) { - return false; - } else { - NodeList children = node.getChildNodes(); - for (int i = 0, n = children.getLength(); i < n; i++) { - Object child = children.item(i); - if (isText((Node) child)) { - if (!isTransparentText((Node) child)) { - return true; - } - } else { - return true; - } - } - } + NodeList children = node.getChildNodes(); + for (int i = 0, n = children.getLength(); i < n; i++) { + Object child = children.item(i); + if (isText((Node) child)) { + if (!isTransparentText((Node) child)) { + return true; + } + } else { + return true; + } + } return false; } @@ -1481,20 +1443,19 @@ public class EditModelQuery { public boolean hasNonTransparentChild(Node node, String[] excludes) { if (!node.hasChildNodes()) { return false; - } else { - NodeList children = node.getChildNodes(); - for (int i = 0, n = children.getLength(); i < n; i++) { - Object child = children.item(i); - if (isText((Node) child)) { - if (!isTransparentText((Node) child)) { - return true; - } - } else if (!Arrays.asList(excludes).contains( - ((Node) child).getLocalName())) { - return true; - } - } } + NodeList children = node.getChildNodes(); + for (int i = 0, n = children.getLength(); i < n; i++) { + Object child = children.item(i); + if (isText((Node) child)) { + if (!isTransparentText((Node) child)) { + return true; + } + } else if (!Arrays.asList(excludes).contains( + ((Node) child).getLocalName())) { + return true; + } + } return false; } @@ -1508,10 +1469,9 @@ public class EditModelQuery { node = getNeighbor(node, true); if (isWidget(node)) { return false; - } else { - node = getFirstLeafChild(node); - return isTransparentText(node); } + node = getFirstLeafChild(node); + return isTransparentText(node); } @@ -1547,9 +1507,8 @@ public class EditModelQuery { public boolean isRedundantWightspaces(Node node) { if (isTransparentText(node) && hasWhitespaceNeighbor(node)) { return true; - } else { - return false; } + return false; } public static boolean hasAncestor(Node node, String names[], @@ -1651,17 +1610,16 @@ public class EditModelQuery { int maxLevelToSearch, boolean ignoreCase) { if (ancestor == null || maxLevelToSearch < 0) { return null; - } else { - if (ancestor.getLocalName() != null - && ignoreCase - && Arrays.asList(childrenNames).contains( - ancestor.getLocalName().toLowerCase()) - || !ignoreCase - && Arrays.asList(childrenNames).contains( - ancestor.getLocalName())) { - return ancestor; - } } + if (ancestor.getLocalName() != null + && ignoreCase + && Arrays.asList(childrenNames).contains( + ancestor.getLocalName().toLowerCase()) + || !ignoreCase + && Arrays.asList(childrenNames).contains( + ancestor.getLocalName())) { + return ancestor; + } NodeList children = ancestor.getChildNodes(); for (int i = 0, n = children.getLength(); i < n; i++) { Node result = getChild(children.item(i), childrenNames, @@ -1688,15 +1646,14 @@ public class EditModelQuery { String childrenNames[], int maxLevelToSearch, boolean ignoreCase) { if (ancestor == null || maxLevelToSearch < 0) { return null; - } else { - String nodeName = ancestor.getNodeName(); - if (nodeName != null && ignoreCase - && Arrays.asList(childrenNames).contains(nodeName) - || !ignoreCase - && Arrays.asList(childrenNames).contains(nodeName)) { - return ancestor; - } } + String nodeName = ancestor.getNodeName(); + if (nodeName != null && ignoreCase + && Arrays.asList(childrenNames).contains(nodeName) + || !ignoreCase + && Arrays.asList(childrenNames).contains(nodeName)) { + return ancestor; + } NodeList children = ancestor.getChildNodes(); for (int i = 0, n = children.getLength(); i < n; i++) { Node result = getChildDeferredNode(children.item(i), childrenNames, @@ -1711,7 +1668,7 @@ public class EditModelQuery { public static boolean hasTransparentNodeOnly(Node node) { NodeList children = node.getChildNodes(); for (int i = 0, n = children.getLength(); i < n; i++) { - if (!EditModelQuery.isTransparentText((Node) children.item(i))) { + if (!EditModelQuery.isTransparentText(children.item(i))) { return false; } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/EditValidateUtil.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/EditValidateUtil.java index c3f58ba02..97c7f19dc 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/EditValidateUtil.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/EditValidateUtil.java @@ -181,14 +181,15 @@ public class EditValidateUtil { */ public static boolean validRange(DOMRange range) { try { - EditModelQuery modelQuery = EditModelQuery.getInstance(); + // TODO: never read EditModelQuery modelQuery = EditModelQuery.getInstance(); boolean result = true; IDOMPosition start = range.getStartPosition(); IDOMPosition end = range.getEndPosition(); result &= validPosition(start); result &= validPosition(end); - Node startContainer = start.getContainerNode(); - Node endContainer = end.getContainerNode(); + // TODO: never read +// Node startContainer = start.getContainerNode(); +// Node endContainer = end.getContainerNode(); // Assert.isTrue(isValidForEditing(modelQuery.getCommonAncestor(startContainer, // endContainer))); return result; @@ -300,55 +301,57 @@ public class EditValidateUtil { // } // _logger.debug("^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^"); } + + // TODO: dead? +// private static int getContainerLength(Node node) { +// if (node.getNodeType() == Node.TEXT_NODE) { +// return ((Text) node).getLength(); +// } else { +// if (node.hasChildNodes()) { +// return node.getChildNodes().getLength(); +// } else { +// return 0; +// } +// } +// } - private static int getContainerLength(Node node) { - if (node.getNodeType() == Node.TEXT_NODE) { - return ((Text) node).getLength(); - } else { - if (node.hasChildNodes()) { - return node.getChildNodes().getLength(); - } else { - return 0; - } - } - } - - private static void message(String text) { - // internal debug - _logger.info("+++++ message:" + text); - } + //TODO: dead? +// private static void message(String text) { +// // internal debug +// _logger.info("+++++ message:" + text); +// } public static boolean isValidForEditing(IDOMPosition pos, boolean forward) { - try { +// try { if (pos == null) { return false; } if (pos.isText()) { return true; - } else { - Node container = pos.getContainerNode(); - // only head can't be edited - if (EditModelQuery.isChild(IHTMLConstants.TAG_HEAD, container, - true)) { - return false; - } - Node sibling = EditModelQuery.getInstance().getSibling(pos, - forward); - if (sibling != null) { - if (EditModelQuery.isText(sibling)) { - return true; - } - Assert.isTrue(sibling.getLocalName() != null); - if (EditModelQuery.UNREMOVEBLE_TAGS.contains(sibling - .getLocalName().toLowerCase())) { - return false; - } - } - return true; } - } catch (Exception e) { - return false; - } + Node container = pos.getContainerNode(); + // only head can't be edited + if (EditModelQuery.isChild(IHTMLConstants.TAG_HEAD, container, + true)) { + return false; + } + Node sibling = EditModelQuery.getInstance().getSibling(pos, + forward); + if (sibling != null) { + if (EditModelQuery.isText(sibling)) { + return true; + } + Assert.isTrue(sibling.getLocalName() != null); + if (EditModelQuery.UNREMOVEBLE_TAGS.contains(sibling + .getLocalName().toLowerCase())) { + return false; + } + } + return true; + // TODO: not sure what was being caught here +// } catch (Exception e) { +// return false; +// } } public static boolean isValidForEditing(Node node) { diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/JSFValidatorSupport.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/JSFValidatorSupport.java index fb1be85d7..5440ec34c 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/JSFValidatorSupport.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/JSFValidatorSupport.java @@ -18,7 +18,6 @@ import org.eclipse.jst.pagedesigner.IJSFConstants; import org.eclipse.jst.pagedesigner.utils.BodyHelper; import org.eclipse.jst.pagedesigner.validation.caret.JSFRootContainerPositionRule; import org.w3c.dom.Document; -import org.w3c.dom.Node; /** * This is a temparary class, for automatically insert "view" and "form" tag @@ -35,8 +34,8 @@ public class JSFValidatorSupport { static private QName _qnameForm = new QName(IJMTConstants.URI_JSF_HTML, IJSFConstants.TAG_FORM); - static private QName[] _views = new QName[] { _qnameView, - new QName(IJMTConstants.URI_JSF_CORE, IJSFConstants.TAG_SUBVIEW) }; +// static private QName[] _views = new QName[] { _qnameView, +// new QName(IJMTConstants.URI_JSF_CORE, IJSFConstants.TAG_SUBVIEW) }; /** * If not inside a view/subview, then f:view will be created. If @@ -57,9 +56,8 @@ public class JSFValidatorSupport { if (generateHForm) { return prepareForm(position); - } else { - return position; } + return position; } /** @@ -95,10 +93,10 @@ public class JSFValidatorSupport { */ public static IDOMPosition prepareView(IDOMPosition position, String uri, String localname) { - Node view = null; + //Node view = null; Document document = EditModelQuery.getDocumentNode(position .getContainerNode()); - if ((view = JSFRootContainerPositionRule.getBasicContainer(document)) == null) { + if (JSFRootContainerPositionRule.getBasicContainer(document) == null) { if (!(IJSFConstants.TAG_VIEW.equals(localname))) { position = BodyHelper.insertBody(position, _qnameView, "f"); } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/ValidatorSupport.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/ValidatorSupport.java index 340b67cdf..d60ea8b1a 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/ValidatorSupport.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/ValidatorSupport.java @@ -79,9 +79,8 @@ public class ValidatorSupport { if (form != null) { DOMPosition pos = new DOMPosition(form, 0); return pos; - } else { - return null; } + return null; } public static IBodyInfo getBodyInfo() { diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/html/TableUtil.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/html/TableUtil.java index dbcd45781..4edf306a5 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/html/TableUtil.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/html/TableUtil.java @@ -71,12 +71,11 @@ public class TableUtil { Element preTr = (Element) trList.get(dex); if (preTr.getParentNode() != parent) { break; - } else { - int maxRowSpan = countMaxRowSpan(preTr); - if (maxRowSpan > (index - dex)) { - return true; - } } + int maxRowSpan = countMaxRowSpan(preTr); + if (maxRowSpan > (index - dex)) { + return true; + } } return false; } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/DesignerStructuredTextEditorJSP.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/DesignerStructuredTextEditorJSP.java index f4013ce24..dc84c35d5 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/DesignerStructuredTextEditorJSP.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/DesignerStructuredTextEditorJSP.java @@ -37,10 +37,9 @@ public class DesignerStructuredTextEditorJSP extends StructuredTextEditor { public Object getAdapter(Class required) { if (ITextEditorDropTargetListener.class.equals(required)) { DesignerSourceDropTargetListener listener = new DesignerSourceDropTargetListener( - (StructuredTextEditor) this); + this); return listener; - } else { - return super.getAdapter(required); } + return super.getAdapter(required); } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/HTMLEditor.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/HTMLEditor.java index 836489d52..905318c1e 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/HTMLEditor.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/HTMLEditor.java @@ -132,6 +132,7 @@ public class HTMLEditor extends PostSelectionMultiPageEditorPart implements private class TextInputListener implements ITextInputListener { public void inputDocumentAboutToBeChanged(IDocument oldInput, IDocument newInput) { + // do nothing } public void inputDocumentChanged(IDocument oldInput, IDocument newInput) { @@ -264,7 +265,7 @@ public class HTMLEditor extends PostSelectionMultiPageEditorPart implements // TextInputListener()); } - protected void createAndAddPreviewPage() throws PartInitException { + protected void createAndAddPreviewPage() { Composite composite = new Composite(getContainer(), 0); FillLayout filllayout = new FillLayout(); composite.setLayout(filllayout); @@ -462,10 +463,9 @@ public class HTMLEditor extends PostSelectionMultiPageEditorPart implements } throw new PartInitException("Resource " + input.getName() + " does not exist."); - } else { - throw new PartInitException("Editor could not be open on " - + input.getName()); } + throw new PartInitException("Editor could not be open on " + + input.getName()); } } else if (input instanceof IStorageEditorInput) { InputStream contents = null; @@ -483,9 +483,8 @@ public class HTMLEditor extends PostSelectionMultiPageEditorPart implements // input.getName()}))); //$NON-NLS-1$ throw new PartInitException("Editor could not be open on " + input.getName()); - } else { - ResourceUtils.ensureClosed(contents); } + ResourceUtils.ensureClosed(contents); } } @@ -543,10 +542,9 @@ public class HTMLEditor extends PostSelectionMultiPageEditorPart implements Object obj = ((IDOMModel) getModel()).getDocument().getAdapterFor( IDocumentPageVariableAdapter.class); if (obj instanceof IPageVariablesProvider) { - return (IPageVariablesProvider) obj; - } else { - return null; + return obj; } + return null; } else { // DMW: I'm bullet-proofing this because // its been reported (on 4.03 version) a null pointer sometimes @@ -1002,8 +1000,7 @@ public class HTMLEditor extends PostSelectionMultiPageEditorPart implements public String getPartName() { if (_textEditor != null) { return _textEditor.getPartName(); - } else { - return super.getPartName(); } + return super.getPartName(); } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/SimpleGraphicalEditor.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/SimpleGraphicalEditor.java index bbfc8dce2..cec568571 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/SimpleGraphicalEditor.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/SimpleGraphicalEditor.java @@ -209,29 +209,29 @@ public class SimpleGraphicalEditor extends GraphicalEditor implements Menu menu = menuMgr.createContextMenu(gviewer); gviewer.setMenu(menu); menuMgr.addMenuListener(new IMenuListener() { - public void menuAboutToShow(IMenuManager menuMgr) { - PageDesignerActionConstants.addStandardActionGroups(menuMgr); + public void menuAboutToShow(IMenuManager menuMgr1) { + PageDesignerActionConstants.addStandardActionGroups(menuMgr1); - menuMgr.add(new RunAction(SimpleGraphicalEditor.this._delegate, + menuMgr1.add(new RunAction(SimpleGraphicalEditor.this._delegate, RunAction.LAUNCH_MODE_RUN)); - menuMgr.add(new RunAction(SimpleGraphicalEditor.this._delegate, + menuMgr1.add(new RunAction(SimpleGraphicalEditor.this._delegate, RunAction.LAUNCH_MODE_DEBUG)); // FIXME: for UNDO/REDO, maybe need also wrap them in // DesignerCommand. // otherwise don't have validate() called after the source // change. - menuMgr.appendToGroup(PageDesignerActionConstants.GROUP_UNDO, + menuMgr1.appendToGroup(PageDesignerActionConstants.GROUP_UNDO, getAction(IWorkbenchActionDefinitionIds.UNDO)); - menuMgr.appendToGroup(PageDesignerActionConstants.GROUP_UNDO, + menuMgr1.appendToGroup(PageDesignerActionConstants.GROUP_UNDO, getAction(IWorkbenchActionDefinitionIds.REDO)); - menuMgr.appendToGroup(PageDesignerActionConstants.GROUP_EDIT, + menuMgr1.appendToGroup(PageDesignerActionConstants.GROUP_EDIT, getAction(IWorkbenchActionDefinitionIds.CUT)); - menuMgr.appendToGroup(PageDesignerActionConstants.GROUP_EDIT, + menuMgr1.appendToGroup(PageDesignerActionConstants.GROUP_EDIT, getAction(IWorkbenchActionDefinitionIds.COPY)); - menuMgr.appendToGroup(PageDesignerActionConstants.GROUP_EDIT, + menuMgr1.appendToGroup(PageDesignerActionConstants.GROUP_EDIT, getAction(IWorkbenchActionDefinitionIds.PASTE)); - menuMgr.appendToGroup(PageDesignerActionConstants.GROUP_EDIT, + menuMgr1.appendToGroup(PageDesignerActionConstants.GROUP_EDIT, getAction(IWorkbenchActionDefinitionIds.DELETE)); ContainerActionGroup containerActionGroup = new ContainerActionGroup(); @@ -239,7 +239,7 @@ public class SimpleGraphicalEditor extends GraphicalEditor implements .getSelection()); context.setInput(_viewer); containerActionGroup.setContext(context); - containerActionGroup.fillContextMenu(menuMgr); + containerActionGroup.fillContextMenu(menuMgr1); containerActionGroup.setContext(null); // TableActionGroup tableActionGroup = new TableActionGroup(); @@ -252,13 +252,13 @@ public class SimpleGraphicalEditor extends GraphicalEditor implements context = new ActionContext(_viewer.getSelection()); context.setInput(_viewer); rangeActionGroup.setContext(context); - rangeActionGroup.fillContextMenu(menuMgr); + rangeActionGroup.fillContextMenu(menuMgr1); rangeActionGroup.setContext(null); SingleElementActionGroup singleActionGroup = new SingleElementActionGroup(); singleActionGroup.setContext(new ActionContext(_viewer .getSelection())); - singleActionGroup.fillContextMenu(menuMgr); + singleActionGroup.fillContextMenu(menuMgr1); singleActionGroup.setContext(null); // IAction customize = @@ -268,14 +268,14 @@ public class SimpleGraphicalEditor extends GraphicalEditor implements // customize); RelatedViewActionGroup viewMenu = new RelatedViewActionGroup(); - viewMenu.fillContextMenu(menuMgr); + viewMenu.fillContextMenu(menuMgr1); CustomedContextMenuActionGroup customedMenu = new CustomedContextMenuActionGroup(); customedMenu.setContext(new ActionContext(_viewer .getSelection())); customedMenu.setModel(_model); customedMenu.setParentControl(_viewer.getControl()); - customedMenu.fillContextMenu(menuMgr); + customedMenu.fillContextMenu(menuMgr1); customedMenu.setContext(null); customedMenu.setParentControl(null); customedMenu.setModel(null); @@ -402,9 +402,8 @@ public class SimpleGraphicalEditor extends GraphicalEditor implements public boolean isDirty() { if (_delegate != null) { return _delegate.isDirty(); - } else { - return false; } + return false; } /* @@ -415,9 +414,8 @@ public class SimpleGraphicalEditor extends GraphicalEditor implements public boolean isSaveAsAllowed() { if (_delegate != null) { return _delegate.isSaveAsAllowed(); - } else { - return false; } + return false; } /* @@ -627,6 +625,7 @@ public class SimpleGraphicalEditor extends GraphicalEditor implements _model.addModelStateListener(new IModelStateListener() { public void modelAboutToBeChanged(IStructuredModel model) { + // nothing to do } public void modelChanged(IStructuredModel model) { @@ -641,20 +640,25 @@ public class SimpleGraphicalEditor extends GraphicalEditor implements public void modelDirtyStateChanged(IStructuredModel model, boolean isDirty) { + // do nothing } public void modelResourceDeleted(IStructuredModel model) { + // do nothign } public void modelResourceMoved(IStructuredModel oldModel, IStructuredModel newModel) { + // do nothing } public void modelAboutToBeReinitialized( IStructuredModel structuredModel) { + // do nothing } public void modelReinitialized(IStructuredModel structuredModel) { + // do nothing } }); } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/ActionsMessages.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/ActionsMessages.java index 7aacf8a4e..4d0e649ef 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/ActionsMessages.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/ActionsMessages.java @@ -25,6 +25,7 @@ public class ActionsMessages { .getBundle(BUNDLE_NAME); private ActionsMessages() { + // no external instantiation } public static String getString(String key) { diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/DesignActionBarFactory.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/DesignActionBarFactory.java index 7ff6c9378..03fb36c64 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/DesignActionBarFactory.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/DesignActionBarFactory.java @@ -25,6 +25,7 @@ public class DesignActionBarFactory { private static DesignActionBarFactory _instance; private DesignActionBarFactory() { + // no external instantiation } public static DesignActionBarFactory getInstance() { diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/DesignPageActionContributor.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/DesignPageActionContributor.java index 31ad867fc..18e38ff09 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/DesignPageActionContributor.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/DesignPageActionContributor.java @@ -214,5 +214,6 @@ public class DesignPageActionContributor extends EditorActionBarContributor { * @see org.eclipse.ui.IEditorActionBarContributor#dispose() */ public void dispose() { + // TODO: anything to dispose? } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/PageDesignerActionBarContributor2.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/PageDesignerActionBarContributor2.java index 50f166f96..d5bbe2de3 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/PageDesignerActionBarContributor2.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/PageDesignerActionBarContributor2.java @@ -11,23 +11,15 @@ *******************************************************************************/ package org.eclipse.jst.pagedesigner.editors.actions; -import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.IStatusLineManager; import org.eclipse.jface.action.IToolBarManager; import org.eclipse.jst.pagedesigner.IJMTConstants; -import org.eclipse.jst.pagedesigner.actions.container.ContainerActionGroup; -import org.eclipse.jst.pagedesigner.actions.menuextension.CustomedContextMenuActionGroup; -import org.eclipse.jst.pagedesigner.actions.range.RangeActionGroup; -import org.eclipse.jst.pagedesigner.actions.single.SingleElementActionGroup; import org.eclipse.jst.pagedesigner.editors.HTMLEditor; import org.eclipse.jst.pagedesigner.editors.SimpleGraphicalEditor; import org.eclipse.jst.pagedesigner.ui.common.sash.NestedEditorActionBarContributor; -import org.eclipse.jst.pagedesigner.viewer.IHTMLGraphicalViewer; import org.eclipse.ui.IActionBars; import org.eclipse.ui.IEditorPart; -import org.eclipse.ui.actions.ActionContext; -import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; import org.eclipse.wst.sse.ui.StructuredTextEditor; import org.eclipse.wst.sse.ui.internal.ExtendedEditorActionBuilder; import org.eclipse.wst.sse.ui.internal.IExtendedContributor; @@ -56,12 +48,13 @@ public class PageDesignerActionBarContributor2 extends DesignerStyleActionGroup _group = new DesignerStyleActionGroup(); - private IHTMLGraphicalViewer _viewer = null; +// private IHTMLGraphicalViewer _viewer = null; +// +// private IStructuredModel _model = null; - private IStructuredModel _model = null; - - public static Action action = new Action() { - }; +// private final static Action action = new Action() { +// +// }; public PageDesignerActionBarContributor2() { super(); @@ -151,39 +144,40 @@ public class PageDesignerActionBarContributor2 extends * @see IExtendedContributor#contributeToPopupMenu(IMenuManager) */ public final void contributeToPopupMenu(IMenuManager menu) { - addToPopupMenu(menu); + // TODO: this method is empty addToPopupMenu(menu); if (_extendedContributor != null) _extendedContributor.contributeToPopupMenu(menu); } - protected void addToPopupMenu(IMenuManager menu) { - } +// protected void addToPopupMenu(IMenuManager menu) { +// // do nothing +// } /** * @see org.eclipse.ui.part.EditorActionBarContributor#contributeToToolBar(IToolBarManager) */ public final void contributeToToolBar(IToolBarManager toolBarManager) { super.contributeToToolBar(toolBarManager); - addToToolBar(toolBarManager); + // TODO: this method is empty addToToolBar(toolBarManager); if (_extendedContributor != null) _extendedContributor.contributeToToolBar(toolBarManager); } - protected void addToToolBar(IToolBarManager toolBarManager) { - } +// protected void addToToolBar(IToolBarManager toolBarManager) { +// } /** * @see org.eclipse.ui.part.EditorActionBarContributor#contributeToStatusLine(IStatusLineManager) */ public final void contributeToStatusLine(IStatusLineManager manager) { super.contributeToStatusLine(manager); - addToStatusLine(manager); + // TODO: this method does nothing addToStatusLine(manager); if (_extendedContributor != null) _extendedContributor.contributeToStatusLine(manager); } - protected void addToStatusLine(IStatusLineManager manager) { - } +// protected void addToStatusLine(IStatusLineManager manager) { +// } /** * @see IExtendedContributor#updateToolbarActions() @@ -198,8 +192,8 @@ public class PageDesignerActionBarContributor2 extends public void setActiveEditor(IEditorPart targetEditor) { if (targetEditor instanceof HTMLEditor) { _htmlEditor = (HTMLEditor) targetEditor; - StructuredTextEditor textEditor = _htmlEditor.getTextEditor(); - this._model = textEditor.getModel(); + //StructuredTextEditor textEditor = _htmlEditor.getTextEditor(); + // TODO: never read this._model = textEditor.getModel(); } super.setActiveEditor(targetEditor); updateToolbarActions(); @@ -216,13 +210,13 @@ public class PageDesignerActionBarContributor2 extends if (activeEditor instanceof StructuredTextEditor) { activateSourcePage((StructuredTextEditor) activeEditor); } else if (activeEditor instanceof SimpleGraphicalEditor) { - SimpleGraphicalEditor graphEditor = (SimpleGraphicalEditor) activeEditor; + //SimpleGraphicalEditor graphEditor = (SimpleGraphicalEditor) activeEditor; activateDesignPage((SimpleGraphicalEditor) activeEditor); - this._viewer = graphEditor.getGraphicViewer(); + // TODO: never read this._viewer = graphEditor.getGraphicViewer(); } else { // currently we don't have special action for preview. deactivateSourceAndDesignPage(activeEditor); - this._viewer = null; + // TODO: never read this._viewer = null; } } @@ -297,49 +291,49 @@ public class PageDesignerActionBarContributor2 extends * ISourceViewerActionBarContributor */) { _sourceViewerActionContributor.setActiveEditor(activeEditor); - ((ISourceViewerActionBarContributor) _sourceViewerActionContributor) - .setViewerSpecificContributionsEnabled(true); + _sourceViewerActionContributor.setViewerSpecificContributionsEnabled(true); } } - private void updateEditorMenu(IMenuManager menuMgr) { - if (this._viewer == null) { - return; - } else { - if (menuMgr != null) { - ContainerActionGroup containerActionGroup = new ContainerActionGroup(); - ActionContext context = new ActionContext(this._viewer - .getSelection()); - context.setInput(this._viewer); - containerActionGroup.setContext(context); - containerActionGroup.fillContextMenu(menuMgr); - containerActionGroup.setContext(null); - - RangeActionGroup rangeActionGroup = new RangeActionGroup(); - context = new ActionContext(this._viewer.getSelection()); - context.setInput(this._viewer); - rangeActionGroup.setContext(context); - rangeActionGroup.fillContextMenu(menuMgr); - rangeActionGroup.setContext(null); - - SingleElementActionGroup singleActionGroup = new SingleElementActionGroup(); - singleActionGroup.setContext(new ActionContext(this._viewer - .getSelection())); - singleActionGroup.fillContextMenu(menuMgr); - singleActionGroup.setContext(null); - - if (this._model != null) { - CustomedContextMenuActionGroup customedMenu = new CustomedContextMenuActionGroup(); - customedMenu.setContext(new ActionContext(_viewer - .getSelection())); - customedMenu.setModel(_model); - customedMenu.setParentControl(_viewer.getControl()); - customedMenu.fillContextMenu(menuMgr); - customedMenu.setContext(null); - customedMenu.setParentControl(null); - customedMenu.setModel(null); - } - } - } - } + // TODO: dead? +// private void updateEditorMenu(IMenuManager menuMgr) { +// if (this._viewer == null) { +// return; +// } else { +// if (menuMgr != null) { +// ContainerActionGroup containerActionGroup = new ContainerActionGroup(); +// ActionContext context = new ActionContext(this._viewer +// .getSelection()); +// context.setInput(this._viewer); +// containerActionGroup.setContext(context); +// containerActionGroup.fillContextMenu(menuMgr); +// containerActionGroup.setContext(null); +// +// RangeActionGroup rangeActionGroup = new RangeActionGroup(); +// context = new ActionContext(this._viewer.getSelection()); +// context.setInput(this._viewer); +// rangeActionGroup.setContext(context); +// rangeActionGroup.fillContextMenu(menuMgr); +// rangeActionGroup.setContext(null); +// +// SingleElementActionGroup singleActionGroup = new SingleElementActionGroup(); +// singleActionGroup.setContext(new ActionContext(this._viewer +// .getSelection())); +// singleActionGroup.fillContextMenu(menuMgr); +// singleActionGroup.setContext(null); +// +// if (this._model != null) { +// CustomedContextMenuActionGroup customedMenu = new CustomedContextMenuActionGroup(); +// customedMenu.setContext(new ActionContext(_viewer +// .getSelection())); +// customedMenu.setModel(_model); +// customedMenu.setParentControl(_viewer.getControl()); +// customedMenu.fillContextMenu(menuMgr); +// customedMenu.setContext(null); +// customedMenu.setParentControl(null); +// customedMenu.setModel(null); +// } +// } +// } +// } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/RelatedViewActionGroup.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/RelatedViewActionGroup.java index bcc3bd41a..4fd500745 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/RelatedViewActionGroup.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/RelatedViewActionGroup.java @@ -45,7 +45,7 @@ public class RelatedViewActionGroup extends ActionGroup { .getString("RelatedViewActionGroup.Menu.ShowView"),//$NON-NLS-1$ PageDesignerActionConstants.MENUMGR_VIEW_ID); viewMgr.add(new Action() { - + // add noop action; TODO: why? }); viewMgr.setRemoveAllWhenShown(true); viewMgr.addMenuListener(new IMenuListener() { @@ -95,7 +95,7 @@ public class RelatedViewActionGroup extends ActionGroup { String iconPath = elements[i].getAttribute("icon"); if (iconPath != null) { icons.put(id, AbstractUIPlugin.imageDescriptorFromPlugin( - elements[i].getDeclaringExtension().getNamespace(), + elements[i].getDeclaringExtension().getContributor().getName(), iconPath)); } else { icons.put(id, null); diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/pagedesigner/DelegatingZoomManager.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/pagedesigner/DelegatingZoomManager.java index e8988ac3f..bc158584a 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/pagedesigner/DelegatingZoomManager.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/pagedesigner/DelegatingZoomManager.java @@ -11,13 +11,13 @@ *******************************************************************************/ package org.eclipse.jst.pagedesigner.editors.pagedesigner; +import org.eclipse.core.runtime.ListenerList; import org.eclipse.draw2d.ScalableFigure; import org.eclipse.draw2d.Viewport; import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gef.editparts.ZoomListener; import org.eclipse.gef.editparts.ZoomManager; -import org.eclipse.jface.util.ListenerList; /** * A delegating ZoomManager. @@ -33,7 +33,7 @@ public class DelegatingZoomManager extends ZoomManager implements ZoomListener { private ZoomManager _currentZoomManager; /** listeners */ - private ListenerList _zoomListeners = new ListenerList(3); + private ListenerList _zoomListeners = new ListenerList(ListenerList.IDENTITY); /** * Creates a new DelegatingZoomManager instance. diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/DesignerPaletteCustomizerDialog.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/DesignerPaletteCustomizerDialog.java index 0f2f8d924..6734c75e3 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/DesignerPaletteCustomizerDialog.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/DesignerPaletteCustomizerDialog.java @@ -137,7 +137,7 @@ public class DesignerPaletteCustomizerDialog extends PaletteCustomizerDialog { } public void update() { - boolean enabled = false; + //boolean enabled = false; PaletteEntry entry = getSelectedPaletteEntry(); if (entry != null) { // if (getCustomizer() instanceof DesignerPaletteCustomizer) diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/DesignerPaletteRoot.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/DesignerPaletteRoot.java index 46556e418..2b9e23b07 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/DesignerPaletteRoot.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/DesignerPaletteRoot.java @@ -218,10 +218,10 @@ public class DesignerPaletteRoot extends PaletteRoot { protected void removeItems() { // we try to remove anything other than the basic // group that have the selectentry and marqeeentry - List children = new ArrayList(getChildren()); - children.remove(0); // remove the first one - for (int i = 0, n = children.size(); i < n; i++) { - this.remove((PaletteEntry) children.get(i)); + List children1 = new ArrayList(getChildren()); + children1.remove(0); // remove the first one + for (int i = 0, n = children1.size(); i < n; i++) { + this.remove((PaletteEntry) children1.get(i)); } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/impl/PaletteElementTemplateHelper.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/impl/PaletteElementTemplateHelper.java index e5e1161bc..23f03c0dd 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/impl/PaletteElementTemplateHelper.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/impl/PaletteElementTemplateHelper.java @@ -15,8 +15,6 @@ import java.util.ArrayList; import java.util.List; import org.eclipse.jst.pagedesigner.IJMTConstants; -import org.eclipse.jst.pagedesigner.PDPlugin; -import org.eclipse.jst.pagedesigner.common.logging.Logger; import org.eclipse.jst.pagedesigner.dom.EditModelQuery; import org.eclipse.jst.pagedesigner.editors.palette.IPaletteItemDescriptor; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; @@ -37,8 +35,8 @@ public class PaletteElementTemplateHelper { private static final String PREFIX_ATTRIBUTE = "uri"; - private static Logger _log = PDPlugin - .getLogger(PaletteElementTemplateHelper.class); +// private static Logger _log = PDPlugin +// .getLogger(PaletteElementTemplateHelper.class); public static NodeList readTemplate(Element item) { if (item != null) { diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/impl/PaletteHelper.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/impl/PaletteHelper.java index 02c9663fe..871373722 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/impl/PaletteHelper.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/impl/PaletteHelper.java @@ -128,7 +128,7 @@ public class PaletteHelper { private static void configItem(IPaletteItemDescriptor item, CMElementDeclaration eledecl) { if (eledecl instanceof HTMLElementDeclaration) { - configHTMLItem(item, (HTMLElementDeclaration) eledecl); + // TODO: does nothing: configHTMLItem(item, (HTMLElementDeclaration) eledecl); } else if (eledecl instanceof TLDElementDeclaration) { configTLDItem(item, (TLDElementDeclaration) eledecl); } @@ -152,9 +152,10 @@ public class PaletteHelper { * @param item * @param declaration */ - private static void configHTMLItem(IPaletteItemDescriptor item, - HTMLElementDeclaration declaration) { - } +// private static void configHTMLItem(IPaletteItemDescriptor item, +// HTMLElementDeclaration declaration) { +// // TODO: does nothing +// } public static void readConfigFromPlugin(IPaletteItemManager manager) { IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry(); diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/impl/PaletteItemDescriptor.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/impl/PaletteItemDescriptor.java index 663ef7f04..497c3be90 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/impl/PaletteItemDescriptor.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/impl/PaletteItemDescriptor.java @@ -352,23 +352,22 @@ public class PaletteItemDescriptor implements IPaletteItemDescriptor { nodes.add(node); } return (Node[]) nodes.toArray(new Node[nodes.size()]); - } else { - Node[] result = null; - if (model != null) { - NodeList nl = _templateSubNodes; - if (nl != null) { - String prefixH = JSPUtil.getPrefix(model, - IJMTConstants.URI_JSF_HTML); - String prefixC = JSPUtil.getPrefix(model, - IJMTConstants.URI_JSF_CORE); - - Assert.isTrue(prefixH != null && prefixC != null); - result = PaletteElementTemplateHelper.applyPrefixes( - prefixH, prefixC, nl, model.getDocument()); - } - } - return result; } + Node[] result = null; + if (model != null) { + NodeList nl = _templateSubNodes; + if (nl != null) { + String prefixH = JSPUtil.getPrefix(model, + IJMTConstants.URI_JSF_HTML); + String prefixC = JSPUtil.getPrefix(model, + IJMTConstants.URI_JSF_CORE); + + Assert.isTrue(prefixH != null && prefixC != null); + result = PaletteElementTemplateHelper.applyPrefixes( + prefixH, prefixC, nl, model.getDocument()); + } + } + return result; } /** diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/impl/PaletteItemManager.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/impl/PaletteItemManager.java index 30ce23a94..90e12217a 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/impl/PaletteItemManager.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/impl/PaletteItemManager.java @@ -15,8 +15,6 @@ import java.io.File; import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; -import java.net.MalformedURLException; -import java.net.URL; import java.util.ArrayList; import java.util.Arrays; import java.util.Enumeration; @@ -39,11 +37,10 @@ import org.eclipse.core.resources.IResourceDeltaVisitor; import org.eclipse.core.resources.IWorkspace; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IConfigurationElement; -import org.eclipse.core.runtime.IExtensionPoint; -import org.eclipse.core.runtime.IExtensionRegistry; import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Platform; +import org.eclipse.core.runtime.Status; import org.eclipse.gef.palette.PaletteDrawer; import org.eclipse.gef.palette.PaletteEntry; import org.eclipse.jst.j2ee.internal.deployables.J2EEFlexProjDeployable; @@ -59,7 +56,6 @@ import org.eclipse.jst.pagedesigner.editors.palette.IPaletteItemCategory; import org.eclipse.jst.pagedesigner.editors.palette.IPaletteItemDescriptor; import org.eclipse.jst.pagedesigner.editors.palette.IPaletteItemEntry; import org.eclipse.jst.pagedesigner.editors.palette.IPaletteItemManager; -import org.eclipse.jst.pagedesigner.editors.palette.IResourceManager; import org.eclipse.jst.pagedesigner.utils.XMLUtil; import org.eclipse.wst.common.componentcore.ComponentCore; import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; @@ -84,9 +80,9 @@ public class PaletteItemManager implements IPaletteItemManager, private static Map _managers = new HashMap(); - private static TLDDocument jsfcoreTLD = null; - - private static TLDDocument jsfhtmlTLD = null; +// private static TLDDocument jsfcoreTLD = null; +// +// private static TLDDocument jsfhtmlTLD = null; private List _categories = new ArrayList(); @@ -118,6 +114,7 @@ public class PaletteItemManager implements IPaletteItemManager, */ public void resourceChanged(IResourceChangeEvent event) { IResourceDelta delta = event.getDelta(); + try { if (delta != null) delta.accept(this); @@ -380,7 +377,24 @@ public class PaletteItemManager implements IPaletteItemManager, } zFile.close(); } catch (IOException e) { + PDPlugin.getDefault().getLog().log + (new Status(IStatus.ERROR, PDPlugin.getPluginId(), 0, "Error accessing zip file", e)); } + finally + { + if (zFile != null) + { + try + { + zFile.close(); + } + catch (IOException ioe) + { + PDPlugin.getDefault().getLog().log + (new Status(IStatus.ERROR, PDPlugin.getPluginId(), 0, "Error closing zip file", ioe)); + } + } + } } } @@ -404,6 +418,8 @@ public class PaletteItemManager implements IPaletteItemManager, } } } catch (CoreException e) { + PDPlugin.getDefault().getLog().log + (new Status(IStatus.ERROR, PDPlugin.getPluginId(), 0, "Error initalizing form folder", e)); } } @@ -425,142 +441,143 @@ public class PaletteItemManager implements IPaletteItemManager, /** * */ - private void initForPluginExtension() { - IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry(); - - IExtensionPoint point = extensionRegistry.getExtensionPoint( - IPaletteConstants.BUNDLE_ID, - IPaletteConstants.EXTENSION_POINT_ID); - - IConfigurationElement[] elements = point.getConfigurationElements(); - for (int i = 0; i < elements.length; i++) { - try { - IConfigurationElement element = elements[i]; - Object obj = element.createExecutableExtension("class"); //$NON-NLS-1$ - - if (obj instanceof IResourceManager && _curProject != null) { - IResourceManager manager = (IResourceManager) obj; - List resources = manager.getResourceList(_curProject); - for (Iterator iter = resources.iterator(); iter.hasNext();) { - String path = (String) iter.next(); - try { - URL url = new URL(path); - url = Platform.asLocalURL(url); - String filepath = url.toExternalForm(); - filepath = filepath.replace('\\', '/'); - TLDDocument doc = null; - - if (path.indexOf("!") > 0) //$NON-NLS-1$ - { - - DocumentFactoryTLD factory = new DocumentFactoryTLD(); - String jarFile = path.substring(0, path - .indexOf("!")); //$NON-NLS-1$ - if (jarFile.startsWith(JARPROTO)) { - jarFile = jarFile.substring(JARPROTO - .length()); - } - String contentName = path.substring(path - .indexOf("!") + 1, path.length()); //$NON-NLS-1$ - if (contentName.startsWith("/")) { - contentName = contentName.substring(1); - } - // first get resource from project, if not exist - // , from eclipse plugin. - String jarpathofproject = null; - try { - jarpathofproject = jarFile.substring(0, - jarFile.toUpperCase().indexOf( - ".JAR") + 4); - jarpathofproject = jarpathofproject - .substring(jarpathofproject - .lastIndexOf("/") + 1); - jarpathofproject = getRelativeProjectFile( - _curProject, - IFileFolderConstants.FOLDER_WEBINF - + "/" - + IFileFolderConstants.FOLDER_LIB - + "/" + jarpathofproject); - } catch (Exception e) { - jarpathofproject = null; - } - if (jarpathofproject != null) { - jarpathofproject = jarpathofproject - .replace('\\', '/'); - doc = (TLDDocument) factory - .buildCMDocumentFromJar( - jarpathofproject, - contentName); - } else { - doc = (TLDDocument) factory - .buildCMDocumentFromJar(jarFile, - contentName); - } - } else { - if (filepath.startsWith(FILEPROTO))// if - // filepath - // starts - // with - // "file://" - // will have - // problem - // to be - // paremeter. - { - filepath = filepath.substring(FILEPROTO - .length()); - } - String tldpathofproject = null; - try { - tldpathofproject = filepath.substring(0, - filepath.toUpperCase().indexOf( - ".TLD") + 4); - tldpathofproject = tldpathofproject - .substring(tldpathofproject - .lastIndexOf("/") + 1); - tldpathofproject = getRelativeProjectFile( - _curProject, - IFileFolderConstants.FOLDER_WEBINF - + "/" - + IFileFolderConstants.FOLDER_TAGLIB - + "/" + tldpathofproject); - } catch (Exception e) { - tldpathofproject = null; - } - if (tldpathofproject != null) { - tldpathofproject = tldpathofproject - .replace('\\', '/'); - doc = (TLDDocument) ContentModelManager - .getInstance().createCMDocument( - tldpathofproject, "tld"); //$NON-NLS-1$ - } else { - doc = (TLDDocument) ContentModelManager - .getInstance().createCMDocument( - filepath, "tld"); //$NON-NLS-1$ - } - } - - PaletteHelper.configPaletteItemsByTLD(this, doc); - } catch (MalformedURLException e1) { - _log - .error( - "PaletteItemManager.initForPluginExtension.error.MalformedURLException", e1); //$NON-NLS-1$ - } - - catch (IOException e2) { - _log - .error( - "PaletteItemManager.initForPluginExtension.error.IOException", e2); //$NON-NLS-1$ - } - } - } - } catch (CoreException e) { - _log - .error( - "PaletteItemManager.initForPluginExtension.error.InstantiationException", e); //$NON-NLS-1$ - } - } - } + // TODO: dead? +// private void initForPluginExtension() { +// IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry(); +// +// IExtensionPoint point = extensionRegistry.getExtensionPoint( +// IPaletteConstants.BUNDLE_ID, +// IPaletteConstants.EXTENSION_POINT_ID); +// +// IConfigurationElement[] elements = point.getConfigurationElements(); +// for (int i = 0; i < elements.length; i++) { +// try { +// IConfigurationElement element = elements[i]; +// Object obj = element.createExecutableExtension("class"); //$NON-NLS-1$ +// +// if (obj instanceof IResourceManager && _curProject != null) { +// IResourceManager manager = (IResourceManager) obj; +// List resources = manager.getResourceList(_curProject); +// for (Iterator iter = resources.iterator(); iter.hasNext();) { +// String path = (String) iter.next(); +// try { +// URL url = new URL(path); +// url = FileLocator.toFileURL(url); +// String filepath = url.toExternalForm(); +// filepath = filepath.replace('\\', '/'); +// TLDDocument doc = null; +// +// if (path.indexOf("!") > 0) //$NON-NLS-1$ +// { +// +// DocumentFactoryTLD factory = new DocumentFactoryTLD(); +// String jarFile = path.substring(0, path +// .indexOf("!")); //$NON-NLS-1$ +// if (jarFile.startsWith(JARPROTO)) { +// jarFile = jarFile.substring(JARPROTO +// .length()); +// } +// String contentName = path.substring(path +// .indexOf("!") + 1, path.length()); //$NON-NLS-1$ +// if (contentName.startsWith("/")) { +// contentName = contentName.substring(1); +// } +// // first get resource from project, if not exist +// // , from eclipse plugin. +// String jarpathofproject = null; +// try { +// jarpathofproject = jarFile.substring(0, +// jarFile.toUpperCase().indexOf( +// ".JAR") + 4); +// jarpathofproject = jarpathofproject +// .substring(jarpathofproject +// .lastIndexOf("/") + 1); +// jarpathofproject = getRelativeProjectFile( +// _curProject, +// IFileFolderConstants.FOLDER_WEBINF +// + "/" +// + IFileFolderConstants.FOLDER_LIB +// + "/" + jarpathofproject); +// } catch (Exception e) { +// jarpathofproject = null; +// } +// if (jarpathofproject != null) { +// jarpathofproject = jarpathofproject +// .replace('\\', '/'); +// doc = (TLDDocument) factory +// .buildCMDocumentFromJar( +// jarpathofproject, +// contentName); +// } else { +// doc = (TLDDocument) factory +// .buildCMDocumentFromJar(jarFile, +// contentName); +// } +// } else { +// if (filepath.startsWith(FILEPROTO))// if +// // filepath +// // starts +// // with +// // "file://" +// // will have +// // problem +// // to be +// // paremeter. +// { +// filepath = filepath.substring(FILEPROTO +// .length()); +// } +// String tldpathofproject = null; +// try { +// tldpathofproject = filepath.substring(0, +// filepath.toUpperCase().indexOf( +// ".TLD") + 4); +// tldpathofproject = tldpathofproject +// .substring(tldpathofproject +// .lastIndexOf("/") + 1); +// tldpathofproject = getRelativeProjectFile( +// _curProject, +// IFileFolderConstants.FOLDER_WEBINF +// + "/" +// + IFileFolderConstants.FOLDER_TAGLIB +// + "/" + tldpathofproject); +// } catch (Exception e) { +// tldpathofproject = null; +// } +// if (tldpathofproject != null) { +// tldpathofproject = tldpathofproject +// .replace('\\', '/'); +// doc = (TLDDocument) ContentModelManager +// .getInstance().createCMDocument( +// tldpathofproject, "tld"); //$NON-NLS-1$ +// } else { +// doc = (TLDDocument) ContentModelManager +// .getInstance().createCMDocument( +// filepath, "tld"); //$NON-NLS-1$ +// } +// } +// +// PaletteHelper.configPaletteItemsByTLD(this, doc); +// } catch (MalformedURLException e1) { +// _log +// .error( +// "PaletteItemManager.initForPluginExtension.error.MalformedURLException", e1); //$NON-NLS-1$ +// } +// +// catch (IOException e2) { +// _log +// .error( +// "PaletteItemManager.initForPluginExtension.error.IOException", e2); //$NON-NLS-1$ +// } +// } +// } +// } catch (CoreException e) { +// _log +// .error( +// "PaletteItemManager.initForPluginExtension.error.InstantiationException", e); //$NON-NLS-1$ +// } +// } +// } /** * @@ -670,11 +687,10 @@ public class PaletteItemManager implements IPaletteItemManager, name = name.replace('/', File.separatorChar); name = name.replace('\\', File.separatorChar); return name; - } else { - _filename = _filename.replace('/', File.separatorChar); - _filename = _filename.replace('\\', File.separatorChar); - return _filename; } + _filename = _filename.replace('/', File.separatorChar); + _filename = _filename.replace('\\', File.separatorChar); + return _filename; } public void setFilename(String filename) { diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/DragMoveEditPolicy.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/DragMoveEditPolicy.java index 9331fb2a0..788fe9949 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/DragMoveEditPolicy.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/DragMoveEditPolicy.java @@ -96,10 +96,9 @@ public class DragMoveEditPolicy extends GraphicalEditPolicy { if (REQ_CLONE.equals(type)) { return new CloneNodeCommand((IHTMLGraphicalViewer) getHost() .getViewer(), domposition, draggedNode); - } else { - return new MoveNodeCommand((IHTMLGraphicalViewer) getHost() - .getViewer(), domposition, draggedNode); } + return new MoveNodeCommand((IHTMLGraphicalViewer) getHost() + .getViewer(), domposition, draggedNode); } /* @@ -148,7 +147,7 @@ public class DragMoveEditPolicy extends GraphicalEditPolicy { && type != REQ_MOVE_CHILDREN) { return; } - EditPart host = getHost(); + //TODO: not used EditPart host = getHost(); DesignPosition position = findPosition(r); if (position != null) { Rectangle rect = EditPartPositionHelper diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/ElementResizableEditPolicy.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/ElementResizableEditPolicy.java index 216ac5539..68efc82f2 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/ElementResizableEditPolicy.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/ElementResizableEditPolicy.java @@ -248,9 +248,8 @@ public class ElementResizableEditPolicy extends ResizableEditPolicy { if (part != null && part.getModel() instanceof Node) { return EditModelQuery.HTML_STYLE_NODES.contains(((Node) part .getModel()).getNodeName()); - } else { - return false; } + return false; } /** @@ -282,9 +281,8 @@ public class ElementResizableEditPolicy extends ResizableEditPolicy { .getCopy(); part.getFigure().translateToRelative(location); return shouldUseObjectMode(location); - } else { - return false; // should not happen } + return false; // should not happen } /** @@ -343,16 +341,13 @@ public class ElementResizableEditPolicy extends ResizableEditPolicy { if (((ElementEditPart) getHost()).isResizable()) { // super is Resizable policy, will create a resize handles. return super.createSelectionHandles(); - } else { - return createNonResizeHandles(); } - } else { - return createFragmentsHandles(); + return createNonResizeHandles(); } - } else { - // second case - return createNonResizeHandles(); + return createFragmentsHandles(); } + // second case + return createNonResizeHandles(); } /** @@ -398,11 +393,10 @@ public class ElementResizableEditPolicy extends ResizableEditPolicy { if (height > 0) { map.put("height", height + "px"); } - if (map.isEmpty()) { - return null; - } else { - return new ChangeStyleCommand(element, map); + if (!map.isEmpty()) { + return new ChangeStyleCommand(element, map); } + return null; } /* diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/FragmentHandle.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/FragmentHandle.java index d242d7b6a..3857c35c9 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/FragmentHandle.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/FragmentHandle.java @@ -20,7 +20,6 @@ import org.eclipse.draw2d.LineBorder; import org.eclipse.draw2d.Locator; import org.eclipse.draw2d.PositionConstants; import org.eclipse.draw2d.geometry.Dimension; -import org.eclipse.draw2d.geometry.Insets; import org.eclipse.draw2d.geometry.PrecisionRectangle; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gef.DragTracker; @@ -63,8 +62,8 @@ public class FragmentHandle extends AbstractHandle implements Handle { } public void refresh() { - Insets insets = getOwnerFigure().getInsets(); - Rectangle bounds; + // TODO: not ref Insets insets = getOwnerFigure().getInsets(); + // TODO: not ref Rectangle bounds; // set the bounds of this figure, so it could cover all children. bounds = getOwnerFigure().getBounds(); diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/LinkEditPolicy.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/LinkEditPolicy.java index fd93c9006..ad222bef7 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/LinkEditPolicy.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/LinkEditPolicy.java @@ -35,13 +35,14 @@ public class LinkEditPolicy extends GraphicalEditPolicy { EditPart part = this.getHost(); IHTMLGraphicalViewer viewer = null; if (part instanceof TextEditPart) { - part = (TextEditPart) part; + //TODO: ?? part = (TextEditPart) part; viewer = (IHTMLGraphicalViewer) part.getViewer(); } if (request instanceof LinkRequest) { LinkRequest req = (LinkRequest) request; String identifier = req.getIdentifier(); DesignRange range = req.getDesignRange(); + // TODO: when part !instancof TextEditPart, viewer == null Command command = new MakeLinkCommand(identifier, viewer, part, range); return command; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/LocationHelper.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/LocationHelper.java index 09a94f002..657067fd7 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/LocationHelper.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/LocationHelper.java @@ -60,7 +60,7 @@ public class LocationHelper { result[1] = null; return true; } - GraphicalEditPart ref = null; + // TODO: never read GraphicalEditPart ref = null; for (int i = 0, size = children.size(); i < size; i++) { GraphicalEditPart child = (GraphicalEditPart) children.get(i); Rectangle rect = getAbsoluteBounds(child); @@ -93,10 +93,9 @@ public class LocationHelper { // closer. if (p.x > rect.x + rect.width / 2) { continue; - } else { - result[1] = child; - return true; } + result[1] = child; + return true; } else if (rect.x + rect.width < p.x || rect.y + rect.height < p.y) { // p is at right or below rect. so the point is "after" the // rect. @@ -182,11 +181,12 @@ public class LocationHelper { } protected static ModelQuery getModelQuery(Node node) { + Document doc = node.getOwnerDocument(); + if (node.getNodeType() == Node.DOCUMENT_NODE) { - return ModelQueryUtil.getModelQuery((Document) node); - } else { - return ModelQueryUtil.getModelQuery(node.getOwnerDocument()); + doc = (Document) node; } + return ModelQueryUtil.getModelQuery(doc); } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/MoveSupport.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/MoveSupport.java index f7f5aca09..978ac514c 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/MoveSupport.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/MoveSupport.java @@ -33,9 +33,8 @@ public class MoveSupport { if (parts == null || parts.size() != 1 || !(parts.get(0) instanceof NodeEditPart)) { return false; - } else { - return true; } + return true; } /** diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/elementedit/AbstractElementEdit.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/elementedit/AbstractElementEdit.java index 07e9a8acc..f19fffb25 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/elementedit/AbstractElementEdit.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/elementedit/AbstractElementEdit.java @@ -24,6 +24,7 @@ import org.w3c.dom.Element; * @author mengbo * @version 1.5 */ +// TODO: should this be abstract? public class AbstractElementEdit implements IElementEdit { /* * (non-Javadoc) @@ -31,6 +32,7 @@ public class AbstractElementEdit implements IElementEdit { * @see org.eclipse.jst.pagedesigner.elementedit.IElementEdit#createEditPolicies(org.eclipse.jst.pagedesigner.parts.ElementEditPart) */ public void createEditPolicies(ElementEditPart part) { + // do nothing; sub-classes should override to add edit policies a part } /* diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/elementedit/html/TableElementEdit.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/elementedit/html/TableElementEdit.java index 6c624a326..a0ad741ae 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/elementedit/html/TableElementEdit.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/elementedit/html/TableElementEdit.java @@ -57,7 +57,8 @@ import org.w3c.dom.Node; * @version 1.5 */ public class TableElementEdit extends AbstractElementEdit { - public static Action action = new Action() { + private final static Action action = new Action() { + // TODO: what's this for? }; private static int FAKE_INDEX = -10; @@ -97,7 +98,7 @@ public class TableElementEdit extends AbstractElementEdit { public boolean fillContainerContextMenu(IMenuManager contextMenu, final ElementEditPart tablePart, NodeEditPart nodePart, ISelection innerSelection) { - boolean superret = super.fillContainerContextMenu(contextMenu, + super.fillContainerContextMenu(contextMenu, tablePart, nodePart, innerSelection); Element table = (Element) tablePart.getModel(); @@ -132,9 +133,9 @@ public class TableElementEdit extends AbstractElementEdit { */ private void fillTableMenu(ElementEditPart tablePart, int cellRow, int cellColumn, IMenuManager tableMenu) { - SelectEditPartAction action = new SelectEditPartAction( + SelectEditPartAction action1 = new SelectEditPartAction( PDPlugin.getResourceString("ElementEdit.Submenu.SelectTable"), tablePart);//$NON-NLS-1$ - tableMenu.add(action); + tableMenu.add(action1); tableMenu.add(new Separator()); @@ -235,10 +236,9 @@ public class TableElementEdit extends AbstractElementEdit { if (trq.isRow()) { return new TableResizeRowCommand(viewer, table, trq .getIndex(), trq.getDelta()); - } else { - return new TableResizeColumnCommand(viewer, table, trq - .getIndex(), trq.getDelta()); } + return new TableResizeColumnCommand(viewer, table, trq + .getIndex(), trq.getDelta()); } else if (request instanceof TableInsertRequest) { TableInsertRequest tableInsertRequest = (TableInsertRequest) request; int index = tableInsertRequest.getIndex() @@ -246,18 +246,16 @@ public class TableElementEdit extends AbstractElementEdit { if (tableInsertRequest.isRow()) { return new TableInsertRowCommand(viewer, table, index, tableInsertRequest.isBefore()); - } else { - return new TableInsertColumnCommand(viewer, table, index); } + return new TableInsertColumnCommand(viewer, table, index); } else if (request instanceof TableRowColumnDeleteRequest) { TableRowColumnDeleteRequest deleteReq = (TableRowColumnDeleteRequest) request; if (deleteReq.isRow()) { return new TableDeleteRowCommand(viewer, table, deleteReq .getIndex()); - } else { - return new TableDeleteColumnCommand(viewer, table, - deleteReq.getIndex()); } + return new TableDeleteColumnCommand(viewer, table, + deleteReq.getIndex()); } else if (request instanceof InsertHeaderFooterRequest) { InsertHeaderFooterRequest hfRequest = (InsertHeaderFooterRequest) request; return new TableInsertHeaderFooterCommand(viewer, table, diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/elementedit/jsp/TaglibElementEdit.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/elementedit/jsp/TaglibElementEdit.java index 22d9ef5a3..9c8288013 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/elementedit/jsp/TaglibElementEdit.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/elementedit/jsp/TaglibElementEdit.java @@ -33,15 +33,14 @@ public class TaglibElementEdit extends AbstractElementEdit { public void fillContextMenu(IMenuManager contextMenu, Element ele) { super.fillContextMenu(contextMenu, ele); - TaglibURIAction action = getAction(); + TaglibURIAction action1 = getAction(); - action.setURI(ele.getAttribute(ICSSPropertyID.ATTR_URI)); + action1.setURI(ele.getAttribute(ICSSPropertyID.ATTR_URI)); - if (ele instanceof Element) { - action.setElement((Element) ele); - } - contextMenu.appendToGroup(PageDesignerActionConstants.GROUP_SPECIAL, - action); + action1.setElement(ele); + + contextMenu.appendToGroup(PageDesignerActionConstants.GROUP_SPECIAL, + action1); } private TaglibURIAction getAction() { diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/figurehandler/AbstractFigureHandler.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/figurehandler/AbstractFigureHandler.java index d0c731e2d..eb93312f8 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/figurehandler/AbstractFigureHandler.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/figurehandler/AbstractFigureHandler.java @@ -42,6 +42,7 @@ public abstract class AbstractFigureHandler implements IFigureHandler { */ public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) { + // TODO: anything? } protected ICSSStyle getCSSStyle(Element node) { @@ -51,10 +52,10 @@ public abstract class AbstractFigureHandler implements IFigureHandler { .getAdapterFor(ICSSStyle.class); } if (style == null) { - return DefaultStyle.getInstance(); - } else { - return style; - } + style = DefaultStyle.getInstance(); + } + + return style; } protected void setCurrentFigure(CSSFigure oldFigure) { @@ -69,5 +70,6 @@ public abstract class AbstractFigureHandler implements IFigureHandler { * child class could override this method */ public void dispose() { + // TODO: anything to dispose? } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/figurehandler/FigureFactory.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/figurehandler/FigureFactory.java index 72a6c0b04..82406a2bc 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/figurehandler/FigureFactory.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/figurehandler/FigureFactory.java @@ -15,14 +15,12 @@ import java.util.List; import org.eclipse.draw2d.IFigure; import org.eclipse.jst.pagedesigner.PDPlugin; -import org.eclipse.jst.pagedesigner.css2.ICSSStyle; import org.eclipse.jst.pagedesigner.css2.layout.CSSFigure; import org.eclipse.jst.pagedesigner.css2.layout.CSSTextFigure; import org.eclipse.jst.pagedesigner.css2.provider.ICSSTextProvider; import org.eclipse.jst.pagedesigner.utils.HTMLUtil; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.ImageData; -import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -90,11 +88,12 @@ public class FigureFactory { * * @see org.eclipse.jst.pagedesigner.css2.provider.ICSSTextProvider#getCSSStyle() */ - public ICSSStyle getCSSStyle() { - INodeNotifier notifier = (INodeNotifier) node - .getParentNode(); - return (ICSSStyle) notifier.getAdapterFor(ICSSStyle.class); - } + // TODO: dead? +// public ICSSStyle getCSSStyle() { +// INodeNotifier notifier = (INodeNotifier) node +// .getParentNode(); +// return (ICSSStyle) notifier.getAdapterFor(ICSSStyle.class); +// } /* * (non-Javadoc) diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/figurehandler/InputFigureHandler.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/figurehandler/InputFigureHandler.java index 81823c8f3..68c6d49a2 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/figurehandler/InputFigureHandler.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/figurehandler/InputFigureHandler.java @@ -108,12 +108,11 @@ public class InputFigureHandler extends WidgetFigureHandler { try { if (s != null) { return Integer.parseInt(s); - } else { - return 0; } - } catch (Exception ex) { - return 0; + } catch (NumberFormatException ex) { + // suppress and fall-through; return 0 } + return 0; } /** @@ -171,9 +170,8 @@ public class InputFigureHandler extends WidgetFigureHandler { } if (type.equalsIgnoreCase(ICSSPropertyID.VAL_PASSWORD)) { return getPasswordProvider(node); - } else { - return getTextInputProvider(node); } + return getTextInputProvider(node); } /** diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/figurehandler/SelectFigureHandler.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/figurehandler/SelectFigureHandler.java index 8967cfe22..35b65eb61 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/figurehandler/SelectFigureHandler.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/figurehandler/SelectFigureHandler.java @@ -76,12 +76,11 @@ public class SelectFigureHandler extends WidgetFigureHandler { provider.setOptions(labels); provider.setRows(rowsInt); return provider; - } else { - ComboWidgetProvider provider = new ComboWidgetProvider( - getCSSStyle(node)); - provider.setOptions(labels); - provider.setSelectedLabel(getSelectedLabels(node)); - return provider; } + ComboWidgetProvider provider = new ComboWidgetProvider( + getCSSStyle(node)); + provider.setOptions(labels); + provider.setSelectedLabel(getSelectedLabels(node)); + return provider; } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/itemcreation/ItemCreationEditPolicy.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/itemcreation/ItemCreationEditPolicy.java index ea9da263f..d636ee816 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/itemcreation/ItemCreationEditPolicy.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/itemcreation/ItemCreationEditPolicy.java @@ -51,9 +51,8 @@ public class ItemCreationEditPolicy extends GraphicalEditPolicy { IDOMPosition domposition = null; if (position == null) { return null; - } else { - domposition = DOMPositionHelper.toDOMPosition(position); } + domposition = DOMPositionHelper.toDOMPosition(position); if (domposition == null) { return null; } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/itemcreation/ItemCreationTool.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/itemcreation/ItemCreationTool.java index ce67db653..b6c9e891b 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/itemcreation/ItemCreationTool.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/itemcreation/ItemCreationTool.java @@ -14,9 +14,7 @@ package org.eclipse.jst.pagedesigner.itemcreation; import org.eclipse.gef.EditPart; import org.eclipse.gef.Request; import org.eclipse.gef.SharedCursors; -import org.eclipse.gef.SnapToHelper; import org.eclipse.gef.requests.CreateRequest; -import org.eclipse.gef.requests.CreationFactory; import org.eclipse.gef.tools.TargetingTool; import org.eclipse.jst.pagedesigner.editors.palette.IPaletteItemDescriptor; import org.eclipse.swt.graphics.Cursor; @@ -33,9 +31,9 @@ import org.eclipse.swt.graphics.Cursor; public class ItemCreationTool extends TargetingTool { IPaletteItemDescriptor _itemDescriptor; - private CreationFactory factory; + // TODO: dead? never read private CreationFactory factory; - private SnapToHelper helper; + // TODO: dead? never read private SnapToHelper helper; /** * Default constructor. Sets the default and disabled cursors. @@ -80,7 +78,7 @@ public class ItemCreationTool extends TargetingTool { */ public void deactivate() { super.deactivate(); - helper = null; + // TODO: never read helper = null; } /** @@ -128,8 +126,8 @@ public class ItemCreationTool extends TargetingTool { getCreateRequest().setLocation(getLocation()); lockTargetEditPart(getTargetEditPart()); // Snap only when size on drop is employed - helper = (SnapToHelper) getTargetEditPart().getAdapter( - SnapToHelper.class); + // TODO: never read helper = (SnapToHelper) getTargetEditPart().getAdapter( + //SnapToHelper.class); } } return true; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/meta/BindingHandlerDelegate.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/meta/BindingHandlerDelegate.java index 3987fb7d9..ec88bcf5b 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/meta/BindingHandlerDelegate.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/meta/BindingHandlerDelegate.java @@ -39,9 +39,8 @@ public class BindingHandlerDelegate implements IBindingHandler { if (handler != null) { return handler .handleBinding(shell, ancester, element, currentValue); - } else { - return null; } + return null; } /* @@ -100,9 +99,8 @@ public class BindingHandlerDelegate implements IBindingHandler { IDOMModel model = getModel(ancester, element); if (model != null) { return StructuredModelUtil.getProjectFor(model); - } else { - return null; } + return null; } private IDOMModel getModel(IDOMNode ancester, IDOMElement element) { diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/meta/internal/CMRegistry.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/meta/internal/CMRegistry.java index 2b12bb0b0..d266c49be 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/meta/internal/CMRegistry.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/meta/internal/CMRegistry.java @@ -11,7 +11,6 @@ *******************************************************************************/ package org.eclipse.jst.pagedesigner.meta.internal; -import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.net.URL; import java.util.ArrayList; @@ -84,8 +83,6 @@ public class CMRegistry implements ICMRegistry { .subTask(PDPlugin .getResourceString("CMRegistry.OtherConfigration")); readExtensions(); - } catch (IOException ex) { - // ignore } finally { monitor.done(); } @@ -118,7 +115,7 @@ public class CMRegistry implements ICMRegistry { String configFile = eles[i].getAttribute("configFile"); if (configFile != null && configFile.length() > 0) { String bundleName = eles[i].getDeclaringExtension() - .getNamespace(); + .getContributor().getName(); try { Bundle bundle = Platform.getBundle(bundleName); URL cmFileUrl = bundle.getEntry(configFile); @@ -156,7 +153,7 @@ public class CMRegistry implements ICMRegistry { return null; } - private void loadCM(String fileName, Map map) throws IOException { + private void loadCM(String fileName, Map map) { try { URL url = PDPlugin.getDefault().getBundle().getEntry(fileName); ElementDescReader reader = new ElementDescReader(url); diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/meta/internal/CellEditorFactoryRegistry.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/meta/internal/CellEditorFactoryRegistry.java index 0b221e41c..b05429778 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/meta/internal/CellEditorFactoryRegistry.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/meta/internal/CellEditorFactoryRegistry.java @@ -183,7 +183,7 @@ public class CellEditorFactoryRegistry { if (Modifier.isStatic(modifiers) && Modifier.isFinal(modifiers)) { if (fields[i].getType() == String.class) { try { - valueTypes.add((String) fields[i].get(null)); + valueTypes.add(fields[i].get(null)); } catch (IllegalArgumentException ex) { // "Error in fields retrieving:" _log.info("CellEditorFactoryRegistry.Info.2", ex); //$NON-NLS-1$ diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/meta/internal/DefaultEditorCreator.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/meta/internal/DefaultEditorCreator.java index 3d639ba79..b76f112e3 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/meta/internal/DefaultEditorCreator.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/meta/internal/DefaultEditorCreator.java @@ -220,8 +220,7 @@ public class DefaultEditorCreator extends EditorCreator { private String convertToString(Object value) { if (value == null) { return null; - } else { - return value.toString(); } + return value.toString(); } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/meta/internal/LocaleFallback.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/meta/internal/LocaleFallback.java index 96cd87a3b..fa62e9497 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/meta/internal/LocaleFallback.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/meta/internal/LocaleFallback.java @@ -75,25 +75,22 @@ public class LocaleFallback { if (languageLength == 0 && countryLength == 0 && variantLength == 0) { // The locale is "", "", "". return list; - } else { - item = new StringBuffer(); - item = item.append('_').append(language); - list.add(item.toString()); } + item = new StringBuffer(); + item = item.append('_').append(language); + list.add(item.toString()); if (countryLength == 0 && variantLength == 0) { return list; - } else { - item.append('_').append(country); - list.add(item.toString()); } + item.append('_').append(country); + list.add(item.toString()); if (variantLength == 0) { return list; - } else { - item.append('_').append(variantLength); - list.add(item.toString()); } + item.append('_').append(variantLength); + list.add(item.toString()); return list; } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/parts/CSSStyleAdapterFactory.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/parts/CSSStyleAdapterFactory.java index d0734e48f..3e0eee949 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/parts/CSSStyleAdapterFactory.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/parts/CSSStyleAdapterFactory.java @@ -25,7 +25,7 @@ import org.w3c.dom.Element; public class CSSStyleAdapterFactory extends AbstractAdapterFactory { static Class ADAPTERKEY = ICSSStyle.class; - private static CSSStyleAdapterFactory _instance = new CSSStyleAdapterFactory(); + // TODO: dead? private static CSSStyleAdapterFactory _instance = new CSSStyleAdapterFactory(); private CSSStyleAdapterFactory() { super(ADAPTERKEY, true); @@ -38,16 +38,16 @@ public class CSSStyleAdapterFactory extends AbstractAdapterFactory { protected INodeAdapter createAdapter(INodeNotifier target) { if (target instanceof Element) { return new AbstractStyle((Element) target); - } else { - return null; } + return null; } /** * @return */ public static CSSStyleAdapterFactory getInstance() { - return _instance = new CSSStyleAdapterFactory(); + // TODO: this 'singleton' is broken + return new CSSStyleAdapterFactory(); } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/parts/DocumentEditPart.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/parts/DocumentEditPart.java index 691825c22..71a42143d 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/parts/DocumentEditPart.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/parts/DocumentEditPart.java @@ -48,9 +48,9 @@ public class DocumentEditPart extends NodeEditPart implements StyleListener, return list; } - NodeList children = model.getChildNodes(); - for (int i = 0, n = children.getLength(); i < n; i++) { - Node node = children.item(i); + NodeList children1 = model.getChildNodes(); + for (int i = 0, n = children1.getLength(); i < n; i++) { + Node node = children1.item(i); if (node.getNodeType() != Node.TEXT_NODE && node.getNodeType() != Node.ELEMENT_NODE) { continue; @@ -105,9 +105,9 @@ public class DocumentEditPart extends NodeEditPart implements StyleListener, */ protected void refreshChildren() { super.refreshChildren(); - List children = getChildren(); - for (int i = 0, size = children.size(); i < size; i++) { - ((EditPart) children.get(i)).refresh(); + List children1 = getChildren(); + for (int i = 0, size = children1.size(); i < size; i++) { + ((EditPart) children1.get(i)).refresh(); } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/parts/EditProxyAdapter.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/parts/EditProxyAdapter.java index 55381c611..9cd7ff06d 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/parts/EditProxyAdapter.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/parts/EditProxyAdapter.java @@ -56,6 +56,7 @@ public class EditProxyAdapter implements INodeAdapter, IRangeSelectionProxy { */ public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) { + // do nothing? } /* diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/parts/ElementEditPart.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/parts/ElementEditPart.java index 73cf55446..1e6edaf5b 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/parts/ElementEditPart.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/parts/ElementEditPart.java @@ -91,13 +91,11 @@ public class ElementEditPart extends SubNodeEditPart { if (((ElementResizableEditPolicy) policy) .shouldUseObjectMode(request)) { return new ObjectModeDragTracker(this); - } else { - return new RangeDragTracker(this); } - } else { - // should not happen - return new DragEditPartsTracker(this); + return new RangeDragTracker(this); } + // should not happen + return new DragEditPartsTracker(this); } /* @@ -255,10 +253,10 @@ public class ElementEditPart extends SubNodeEditPart { Object model; Map modelToEditPart = new HashMap(); - List children = getChildren(); + List children1 = getChildren(); - for (int i = 0, n = children.size(); i < n; i++) { - editPart = (EditPart) children.get(i); + for (int i = 0, n = children1.size(); i < n; i++) { + editPart = (EditPart) children1.get(i); modelToEditPart.put(editPart.getModel(), editPart); // remove child visual, since we may reconstruct the figure // structure of this edit part @@ -395,17 +393,16 @@ public class ElementEditPart extends SubNodeEditPart { IElementEdit edit = this.getElementEdit(); if (edit != null) { return edit.isResizable(this._elementNode); - } else { - CMElementDeclaration decl = CMUtil - .getElementDeclaration(this._elementNode); - if (decl != null) { - // XXX: default implementation, if this element support "style" - // attribute, - // then we think it support resize. - return decl.getAttributes().getNamedItem("style") != null; - } - return true; } + CMElementDeclaration decl = CMUtil + .getElementDeclaration(this._elementNode); + if (decl != null) { + // XXX: default implementation, if this element support "style" + // attribute, + // then we think it support resize. + return decl.getAttributes().getNamedItem("style") != null; + } + return true; } /** @@ -536,10 +533,10 @@ public class ElementEditPart extends SubNodeEditPart { * @return */ public boolean haveNonWhitespaceTextChild() { - List children = this.getChildren(); - for (int i = 0, size = children.size(); i < size; i++) { - if (children.get(i) instanceof TextEditPart) { - IDOMText xmltext = (IDOMText) ((TextEditPart) children.get(i)) + List children1 = this.getChildren(); + for (int i = 0, size = children1.size(); i < size; i++) { + if (children1.get(i) instanceof TextEditPart) { + IDOMText xmltext = (IDOMText) ((TextEditPart) children1.get(i)) .getIDOMNode(); if (!xmltext.isElementContentWhitespace()) { return true; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/parts/NodeEditPart.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/parts/NodeEditPart.java index 8174eca69..c686fd6e0 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/parts/NodeEditPart.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/parts/NodeEditPart.java @@ -52,9 +52,8 @@ public abstract class NodeEditPart extends AbstractGraphicalEditPart implements public IDOMDocument getDestDocumentForDesign() { if (this._destDocument == null) { return (IDOMDocument) this.getIDOMNode().getOwnerDocument(); - } else { - return this._destDocument; } + return this._destDocument; } /* @@ -129,7 +128,7 @@ public abstract class NodeEditPart extends AbstractGraphicalEditPart implements Object obj = getModel(); if (key == IPropertySource.class) { if (obj instanceof INodeNotifier) { - return (IPropertySource) ((INodeNotifier) obj) + return ((INodeNotifier) obj) .getAdapterFor(IPropertySource.class); } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/parts/TextEditPart.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/parts/TextEditPart.java index 84eba10fa..b01b6558c 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/parts/TextEditPart.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/parts/TextEditPart.java @@ -54,8 +54,7 @@ public class TextEditPart extends SubNodeEditPart implements ICSSTextProvider { protected IFigure createFigure() { // XXX: currently creating of CSSTextFigure is distributed both here // and FigureFactory. We may want to unify them later. - CSSTextFigure figure = new CSSTextFigure(this); - return figure; + return new CSSTextFigure(this); } /* @@ -100,9 +99,9 @@ public class TextEditPart extends SubNodeEditPart implements ICSSTextProvider { * @see org.eclipse.jst.pagedesigner.css2.provider.ICSSTextProvider#getCSSStyle() */ public ICSSStyle getCSSStyle() { - IFigure figure = this.getFigure(); - if (figure instanceof ICSSFigure) { - ICSSStyle style = ((ICSSFigure) figure).getCSSStyle(); + IFigure figure1 = this.getFigure(); + if (figure1 instanceof ICSSFigure) { + ICSSStyle style = ((ICSSFigure) figure1).getCSSStyle(); if (style != null) { return style; } @@ -130,9 +129,8 @@ public class TextEditPart extends SubNodeEditPart implements ICSSTextProvider { String data = _cachedData; if (style.getStyleProperty(ICSSPropertyID.ATTR_WHITESPACE) != ICSSPropertyID.VAL_PRE) { return HTMLUtil.compactWhitespaces(_textNode, data); - } else { - return data; } + return data; } /** diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/preview/PreviewHandlerNew.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/preview/PreviewHandlerNew.java index 84a9c4fc7..63730df56 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/preview/PreviewHandlerNew.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/preview/PreviewHandlerNew.java @@ -11,12 +11,9 @@ *******************************************************************************/ package org.eclipse.jst.pagedesigner.preview; -import java.io.IOException; import java.util.List; import org.eclipse.core.resources.IProject; -import org.eclipse.jst.pagedesigner.PDPlugin; -import org.eclipse.jst.pagedesigner.common.logging.Logger; import org.eclipse.jst.pagedesigner.jsp.core.pagevar.IPageVariablesProvider; import org.eclipse.jst.pagedesigner.jsp.core.pagevar.adapter.IDocumentPageVariableAdapter; import org.eclipse.jst.pagedesigner.parts.DocumentEditPart; @@ -24,8 +21,8 @@ import org.eclipse.jst.pagedesigner.parts.NodeEditPart; import org.eclipse.jst.pagedesigner.utils.PreviewUtil; import org.eclipse.jst.pagedesigner.utils.StructuredModelUtil; import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML; +import org.eclipse.wst.sse.core.StructuredModelManager; import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; -import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager; import org.eclipse.wst.xml.core.internal.document.XMLGeneratorImpl; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; @@ -37,10 +34,10 @@ import org.w3c.dom.Node; * @version 1.5 */ public class PreviewHandlerNew { - private static Logger _log = PDPlugin.getLogger(PreviewHandlerNew.class); + //private static Logger _log = PDPlugin.getLogger(PreviewHandlerNew.class); public static void generatePreview(DocumentEditPart part, - StringBuffer result) throws IOException { + StringBuffer result) { try { IProject prj = StructuredModelUtil.getProjectFor(part.getIDOMNode() .getModel()); diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/preview/WindowsIEBrowser.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/preview/WindowsIEBrowser.java index b03ed75e2..6bf32d56e 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/preview/WindowsIEBrowser.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/preview/WindowsIEBrowser.java @@ -31,25 +31,24 @@ public class WindowsIEBrowser implements ProgressListener { public synchronized void loadFile(File file) { if (_browser == null) { return; - } else { - _file = file; - String s = "file:" + file.getAbsolutePath(); - _browser.setUrl(s); - return; } + _file = file; + String s = "file:" + file.getAbsolutePath(); + _browser.setUrl(s); + return; } public void dispose() { if (_browser == null) { return; - } else { - _browser.dispose(); - _browser = null; - return; } + _browser.dispose(); + _browser = null; + return; } public void changed(ProgressEvent progressevent) { + // do nothing } public synchronized void completed(ProgressEvent progressevent) { diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/AttributePropertyDescriptor.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/AttributePropertyDescriptor.java index 6cf5837e9..8a5f9c2cd 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/AttributePropertyDescriptor.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/AttributePropertyDescriptor.java @@ -61,24 +61,22 @@ public class AttributePropertyDescriptor implements IPropertyDescriptor { if (editor != null) { return editor; - } else { - EditorCreator.CellEditorHolder holder = new EditorCreator.CellEditorHolder() { - /* - * (non-Javadoc) - * - * @see org.eclipse.jst.pagedesigner.meta.EditorCreator.CellEditorHolder#createCellEditor(org.eclipse.swt.widgets.Composite) - */ - public CellEditor createCellEditor(Composite parent) { - if (_inner != null) { - return _inner.createPropertyEditor(parent); - } else { - return new TextCellEditor(parent); - } - } - }; - return EditorCreator.getInstance().createCellEditorWithWrapper( - parent, _attr, holder, (IDOMElement) _element, null); } + EditorCreator.CellEditorHolder holder = new EditorCreator.CellEditorHolder() { + /* + * (non-Javadoc) + * + * @see org.eclipse.jst.pagedesigner.meta.EditorCreator.CellEditorHolder#createCellEditor(org.eclipse.swt.widgets.Composite) + */ + public CellEditor createCellEditor(Composite parent1) { + if (_inner != null) { + return _inner.createPropertyEditor(parent1); + } + return new TextCellEditor(parent1); + } + }; + return EditorCreator.getInstance().createCellEditorWithWrapper( + parent, _attr, holder, (IDOMElement) _element, null); } @@ -91,9 +89,8 @@ public class AttributePropertyDescriptor implements IPropertyDescriptor { String cat = _attr.getCategory(); if (cat != null) { return cat; - } else { - return ITabbedPropertiesConstants.OTHER_CATEGORY; } + return ITabbedPropertiesConstants.OTHER_CATEGORY; } /* diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/AttributePropertySource.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/AttributePropertySource.java index fadeede71..9e6094fa5 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/AttributePropertySource.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/AttributePropertySource.java @@ -108,7 +108,7 @@ public class AttributePropertySource implements IPropertySource { } Command c = new ChangeAttributeCommand( PDPlugin - .getResourceString("AttributePropertySource.CommandLabel.ChangeAttribute"), (IDOMElement) _element, (String) id, (String) value); //$NON-NLS-1$ + .getResourceString("AttributePropertySource.CommandLabel.ChangeAttribute"), _element, (String) id, (String) value); //$NON-NLS-1$ c.execute(); } @@ -158,7 +158,7 @@ public class AttributePropertySource implements IPropertySource { desc)); } else { result.add(new PropertyDescriptorWrapper( - (IDOMElement) _element, desc)); + _element, desc)); } } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/AttributePropertySourceProvider.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/AttributePropertySourceProvider.java index b944edfa0..bdaa0112a 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/AttributePropertySourceProvider.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/AttributePropertySourceProvider.java @@ -22,6 +22,7 @@ import org.w3c.dom.Element; */ public class AttributePropertySourceProvider implements IPropertySourceProvider { public AttributePropertySourceProvider() { + // do nothing? } /* diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/DesignerPropertyTool.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/DesignerPropertyTool.java index 2373c5ea8..3a209fb8a 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/DesignerPropertyTool.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/DesignerPropertyTool.java @@ -384,9 +384,8 @@ public class DesignerPropertyTool { .getNature(JavaCore.NATURE_ID); if (nature == null) { return null; - } else { - return (IJavaProject) nature; } + return (IJavaProject) nature; } catch (Exception e) { // Error.DesignerPropertyTool.NatureQuerying = Error in project // java nature querying diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/DesignerTabbedPropertySheetPage.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/DesignerTabbedPropertySheetPage.java index 063a0ec09..456f7310d 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/DesignerTabbedPropertySheetPage.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/DesignerTabbedPropertySheetPage.java @@ -133,7 +133,7 @@ public class DesignerTabbedPropertySheetPage extends TabbedPropertySheetPage { public void addSelectionChangedListener( ISelectionChangedListener listener) { - ; + // do nothing } /** @@ -155,7 +155,7 @@ public class DesignerTabbedPropertySheetPage extends TabbedPropertySheetPage { */ public void removeSelectionChangedListener( ISelectionChangedListener listener) { - ; + // do nothing } /** diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/PropertyDescriptorWrapper.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/PropertyDescriptorWrapper.java index 6642ba169..633be5194 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/PropertyDescriptorWrapper.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/PropertyDescriptorWrapper.java @@ -53,16 +53,15 @@ public class PropertyDescriptorWrapper implements IPropertyDescriptor { * * @see org.eclipse.jst.pagedesigner.meta.EditorCreator.CellEditorHolder#createCellEditor(org.eclipse.swt.widgets.Composite) */ - public CellEditor createCellEditor(Composite parent) { + public CellEditor createCellEditor(Composite parent1) { if (_inner != null) { - return _inner.createPropertyEditor(parent); - } else { - return new TextCellEditor(parent); + return _inner.createPropertyEditor(parent1); } + return new TextCellEditor(parent1); } }; return EditorCreator.getInstance().createCellEditorWithWrapper(parent, - null, holder, (IDOMElement) _element, null); + null, holder, _element, null); } /* diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/attrgroup/AttributeGroup.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/attrgroup/AttributeGroup.java index c7296b44a..f3a0029cf 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/attrgroup/AttributeGroup.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/attrgroup/AttributeGroup.java @@ -115,9 +115,8 @@ public class AttributeGroup extends DialogFieldGroup { Object obj = field.getAttachedData(KEY_ATTR); if (obj instanceof IAttributeDescriptor) { return (IAttributeDescriptor) obj; - } else { - return null; } + return null; } /** diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/attrgroup/AttributeGroupMessages.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/attrgroup/AttributeGroupMessages.java index 761d4a7de..8804d5fea 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/attrgroup/AttributeGroupMessages.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/attrgroup/AttributeGroupMessages.java @@ -26,6 +26,7 @@ public class AttributeGroupMessages { .getBundle(BUNDLE_NAME); private AttributeGroupMessages() { + // no external instantiation } public static String getString(String key) { diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/celleditors/CellEditorFactory.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/celleditors/CellEditorFactory.java index 6ac004d78..c6bf34d11 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/celleditors/CellEditorFactory.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/celleditors/CellEditorFactory.java @@ -233,10 +233,9 @@ public class CellEditorFactory implements IAttributeCellEditorFactory { if (defaultValue == null) { return LabeledComboBoxCellEditor.newInstance(parent, map, SWT.NONE); - } else { - return LabeledStyleComboCellEditor.newInstance(parent, map, - defaultValue, SWT.NONE); } + return LabeledStyleComboCellEditor.newInstance(parent, map, + defaultValue, SWT.NONE); } else if (IValueType.LOCALE.equalsIgnoreCase(type)) { Map map = new HashMap(); Locale[] locales = Locale.getAvailableLocales(); @@ -287,7 +286,7 @@ public class CellEditorFactory implements IAttributeCellEditorFactory { return new LoadbundleSelectionCellEditor(parent, getProject(element)); } else if (IValueType.CSSID.equalsIgnoreCase(type)) { - + // TODO: missing case? } else if (IValueType.CSSCLASS.equalsIgnoreCase(type)) { String cssclasses[] = CSSUtil.getCSSClasses(element .getOwnerDocument()); @@ -307,10 +306,9 @@ public class CellEditorFactory implements IAttributeCellEditorFactory { if (defaultValue == null) { return LabeledComboBoxCellEditor.newInstance(parent, booleanMap, SWT.NONE); - } else { - return LabeledStyleComboCellEditor.newInstance(parent, - booleanMap, defaultValue, SWT.NONE); } + return LabeledStyleComboCellEditor.newInstance(parent, + booleanMap, defaultValue, SWT.NONE); } else if (IValueType.CSSSTYLE.equalsIgnoreCase(type)) { String param = attr .getParameterByName(IAttributeDescriptor.PARAMETER_STYLE); diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/celleditors/LabeledComboBoxCellEditor.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/celleditors/LabeledComboBoxCellEditor.java index 989c3bb93..1bbaa02c6 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/celleditors/LabeledComboBoxCellEditor.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/celleditors/LabeledComboBoxCellEditor.java @@ -40,7 +40,7 @@ public class LabeledComboBoxCellEditor extends ComboBoxCellEditor { // we'll sort according to label. since that is what being show to user. List list = new ArrayList(); for (Iterator iter = valueLabelMap.keySet().iterator(); iter.hasNext();) { - Object key = (Object) iter.next(); + Object key = iter.next(); String label = (String) valueLabelMap.get(key); list.add(new Object[] { key, label }); } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/celleditors/LabeledStyleComboCellEditor.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/celleditors/LabeledStyleComboCellEditor.java index f1b2cd80c..69381bed5 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/celleditors/LabeledStyleComboCellEditor.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/celleditors/LabeledStyleComboCellEditor.java @@ -32,7 +32,7 @@ public class LabeledStyleComboCellEditor extends StyleComboCellEditor { // we'll sort according to label. since that is what being show to user. List list = new ArrayList(); for (Iterator iter = valueLabelMap.keySet().iterator(); iter.hasNext();) { - Object key = (Object) iter.next(); + Object key = iter.next(); String label = (String) valueLabelMap.get(key); list.add(new Object[] { key, label }); } @@ -70,12 +70,12 @@ public class LabeledStyleComboCellEditor extends StyleComboCellEditor { protected Object doGetValue() { // otherwise limits to set of valid values Object index = super.doGetValue(); - int selection = -1; + int selection1 = -1; if (index instanceof Integer) { - selection = ((Integer) index).intValue(); + selection1 = ((Integer) index).intValue(); } - if (selection >= 0) { - return _values[selection]; + if (selection1 >= 0) { + return _values[selection1]; } else if (getControl() instanceof StyleCombo) { // retrieve the actual text as the list of valid items doesn't // contain the value @@ -93,14 +93,14 @@ public class LabeledStyleComboCellEditor extends StyleComboCellEditor { super.doSetValue(value); } else { String stringValue = value.toString(); - int selection = -1; + int selection1 = -1; for (int i = 0; i < _values.length; i++) { if (_values[i].equals(stringValue)) { - selection = i; + selection1 = i; } } - if (selection >= 0) { - super.doSetValue(new Integer(selection)); + if (selection1 >= 0) { + super.doSetValue(new Integer(selection1)); } else { super.doSetValue(new Integer(-1)); if (getControl() instanceof StyleCombo diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/celleditors/ResourceBoundle.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/celleditors/ResourceBoundle.java index a68d2fe47..7f00ed6df 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/celleditors/ResourceBoundle.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/celleditors/ResourceBoundle.java @@ -25,10 +25,10 @@ public class ResourceBoundle { .getBundle(BUNDLE_NAME); private ResourceBoundle() { + // no external instantiation } public static String getString(String key) { - // TODO Auto-generated method stub try { return RESOURCE_BUNDLE.getString(key); } catch (MissingResourceException e) { diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/internal/DesignerSectionDescriptor.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/internal/DesignerSectionDescriptor.java index a9eed5044..a275711de 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/internal/DesignerSectionDescriptor.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/internal/DesignerSectionDescriptor.java @@ -202,9 +202,8 @@ public class DesignerSectionDescriptor implements ISectionDescriptor { } if (filter.caseSensitive) { return tag.equals(filter.tag); - } else { - return tag.equalsIgnoreCase(filter.tag); } + return tag.equalsIgnoreCase(filter.tag); } /** diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/range/RangeUtil.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/range/RangeUtil.java index bce86c272..9febaaa84 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/range/RangeUtil.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/range/RangeUtil.java @@ -42,9 +42,10 @@ public class RangeUtil { public static Node appendAfter(Node child, Node reference) { Node next = reference.getNextSibling(); if (next == null) + { return reference.getParentNode().appendChild(child); - else - return reference.getParentNode().insertBefore(child, next); + } + return reference.getParentNode().insertBefore(child, next); } public static Node insertBefore(Node child, Node reference) { @@ -87,9 +88,8 @@ public class RangeUtil { insertBefore(t, newnode); return newnode; } - } else { - return insertIntoEditPart(containerEditPart, node, offset); } + return insertIntoEditPart(containerEditPart, node, offset); } /** @@ -105,14 +105,13 @@ public class RangeUtil { if (offset >= childParts.size()) { // to the end of parent return parent.appendChild(node); - } else { - Node child = (Node) ((EditPart) childParts.get(offset)).getModel(); - return insertBefore(node, child); } + Node child = (Node) ((EditPart) childParts.get(offset)).getModel(); + return insertBefore(node, child); } public static TextPosition insertText(DesignPosition position, String data) { - EditPart containerEditPart = position.getContainerPart(); + // TODO: never read EditPart containerEditPart = position.getContainerPart(); position = moveIntoText(position); int offset = position.getOffset(); @@ -133,15 +132,14 @@ public class RangeUtil { IDOMText text = (IDOMText) textPart.getModel(); text.setData(nextData); return new TextPosition(text, offset + data.length()); - } else { - // can't merge into a neighboring text node. So create a text node - // of it's own - EditPart part = position.getContainerPart(); - Node parent = (Node) part.getModel(); - Text text = parent.getOwnerDocument().createTextNode(data); - insertIntoEditPart(part, text, offset); - return new TextPosition((IDOMText) text, offset); } + // can't merge into a neighboring text node. So create a text node + // of it's own + EditPart part = position.getContainerPart(); + Node parent = (Node) part.getModel(); + Text text = parent.getOwnerDocument().createTextNode(data); + insertIntoEditPart(part, text, offset); + return new TextPosition((IDOMText) text, offset); } /** @@ -242,10 +240,11 @@ public class RangeUtil { int result = compareDesignPosition(range.getStartPosition(), range .getEndPosition()); if (result == 1) + { return new DesignRange(range.getEndPosition(), range .getStartPosition()); - else - return range; + } + return range; } /** @@ -273,12 +272,12 @@ public class RangeUtil { EditPart p2a = (EditPart) a2.get(i); if (p1a == p2a) { if (p1a != null) + { continue; // same ancester - else { - // both are null. just compare the offset. - return offset1 < offset2 ? -1 - : (offset1 == offset2 ? 0 : 1); - } + } + // both are null. just compare the offset. + return offset1 < offset2 ? -1 + : (offset1 == offset2 ? 0 : 1); } // p1a != p2a. now we can just compare p1a and p2a to decide the // order. @@ -308,9 +307,10 @@ public class RangeUtil { while (part != null) { list.add(part); if (part instanceof DocumentEditPart) + { break; - else - part = part.getParent(); + } + part = part.getParent(); } if (part == null) { // if part ==null, means we didn't find a DocumentEditPart, diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/requests/LocationModifierRequest.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/requests/LocationModifierRequest.java index 49cc4a617..77e010514 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/requests/LocationModifierRequest.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/requests/LocationModifierRequest.java @@ -21,7 +21,7 @@ import org.eclipse.gef.requests.LocationRequest; */ public class LocationModifierRequest extends LocationRequest { - private int _statemask; + // TODO: dead? private int _statemask; private boolean _controlKeyDown; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/requests/NodeCreationFactory.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/requests/NodeCreationFactory.java index e8cd1e18e..02ed6b000 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/requests/NodeCreationFactory.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/requests/NodeCreationFactory.java @@ -103,8 +103,8 @@ public class NodeCreationFactory implements CreationFactory { IEditorPart editor = page.getActiveEditor(); if (editor instanceof HTMLEditor) { return ((HTMLEditor) editor).getDOMDocument(); - } else - return null; + } + return null; } /* diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tableedit/EmptyLocator.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tableedit/EmptyLocator.java index 9c6e2f78e..d69fc734b 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tableedit/EmptyLocator.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tableedit/EmptyLocator.java @@ -32,6 +32,7 @@ public class EmptyLocator implements Locator { * @see org.eclipse.draw2d.Locator#relocate(org.eclipse.draw2d.IFigure) */ public void relocate(IFigure target) { + // do nothing; this is a noop locator } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tableedit/MarqueeRectangleFigure.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tableedit/MarqueeRectangleFigure.java index 8c4afbbb2..c65e771a3 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tableedit/MarqueeRectangleFigure.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tableedit/MarqueeRectangleFigure.java @@ -35,7 +35,7 @@ class MarqueeRectangleFigure extends Figure { * @see org.eclipse.draw2d.Figure#paintFigure(org.eclipse.draw2d.Graphics) */ protected void paintFigure(Graphics graphics) { - Rectangle bounds = getBounds().getCopy(); + Rectangle bounds1 = getBounds().getCopy(); graphics.translate(getLocation()); graphics.setXORMode(true); @@ -48,19 +48,19 @@ class MarqueeRectangleFigure extends Figure { points[0] = 0 + offset; points[1] = 0; - points[2] = bounds.width - 1; + points[2] = bounds1.width - 1; points[3] = 0; - points[4] = bounds.width - 1; - points[5] = bounds.height - 1; + points[4] = bounds1.width - 1; + points[5] = bounds1.height - 1; graphics.drawPolyline(points); points[0] = 0; points[1] = 0 + offset; points[2] = 0; - points[3] = bounds.height - 1; - points[4] = bounds.width - 1; - points[5] = bounds.height - 1; + points[3] = bounds1.height - 1; + points[4] = bounds1.width - 1; + points[5] = bounds1.height - 1; graphics.drawPolyline(points); diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tableedit/TableEditAdapter.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tableedit/TableEditAdapter.java index 1c820965e..6689636b2 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tableedit/TableEditAdapter.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tableedit/TableEditAdapter.java @@ -52,7 +52,7 @@ public class TableEditAdapter implements ITableEditAdapter { * @see org.eclipse.jst.pagedesigner.editpolicies.ITableEditAdapter#insertColumn(int) */ public void insertColumn(int atPosition) { - + // do nothing } /* diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tableedit/TableSideItemDragTracker.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tableedit/TableSideItemDragTracker.java index c3d068e0d..efedef535 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tableedit/TableSideItemDragTracker.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tableedit/TableSideItemDragTracker.java @@ -22,9 +22,10 @@ import org.eclipse.gef.tools.DragEditPartsTracker; * @version 1.5 */ public class TableSideItemDragTracker extends DragEditPartsTracker { - private boolean _isRow; - - private int _index; + // TODO: dead? + // private boolean _isRow; +// +// private int _index; /** * @@ -35,8 +36,9 @@ public class TableSideItemDragTracker extends DragEditPartsTracker { public TableSideItemDragTracker(EditPart sourceEditPart, boolean isrow, int index) { super(sourceEditPart); - this._isRow = isrow; - this._index = index; + // TODO: dead? +// this._isRow = isrow; +// this._index = index; } /* diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tableedit/TableSideItemHandle.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tableedit/TableSideItemHandle.java index 854f465fa..201b1ff1a 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tableedit/TableSideItemHandle.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tableedit/TableSideItemHandle.java @@ -43,8 +43,8 @@ public abstract class TableSideItemHandle extends AbstractHandle { */ private void initialize() { this.setOpaque(false); - LineBorder border = new LineBorder(ColorConstants.green, 1); - this.setBorder(border); + LineBorder border1 = new LineBorder(ColorConstants.green, 1); + this.setBorder(border1); this.setCursor(Cursors.ARROW); } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tools/ExposeHelper.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tools/ExposeHelper.java index cb82d513c..6e1c24b8f 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tools/ExposeHelper.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tools/ExposeHelper.java @@ -280,9 +280,8 @@ public class ExposeHelper { if (forward) { Rectangle portBounds = port.getBounds().getCopy(); return portBounds.getRight().x - p.x; - } else { - return p.x; } + return p.x; } private int getVerticalBoundsOffset(Point p, boolean up) { @@ -297,9 +296,8 @@ public class ExposeHelper { if (!up) { Rectangle portBounds = port.getBounds().getCopy(); return portBounds.getBottom().y - p.y; - } else { - return p.y; } + return p.y; } public void exposeBorder(Rectangle rect, AbstractEditPolicy policy) { diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tools/RangeDragTracker.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tools/RangeDragTracker.java index 18ba9e6bd..dcd0ddb76 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tools/RangeDragTracker.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tools/RangeDragTracker.java @@ -211,9 +211,8 @@ public class RangeDragTracker extends TargetingTool implements DragTracker { if (getHTMLGraphicalViewer().isInRangeMode()) { rangeSelection(true); return true; - } else { - return super.handleDragInProgress(); } + return super.handleDragInProgress(); } /** @@ -269,9 +268,8 @@ public class RangeDragTracker extends TargetingTool implements DragTracker { if (positionMediator.isEditable(new Target(getSourceEditPart()))) { return getSourceEditPart() instanceof TextEditPart || !(((NodeEditPart) getSourceEditPart()).isWidget()); - } else { - return false; } + return false; } /** diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tools/RangeSelectionTool.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tools/RangeSelectionTool.java index ead3d23c1..5c4307562 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tools/RangeSelectionTool.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tools/RangeSelectionTool.java @@ -18,13 +18,11 @@ import org.eclipse.gef.requests.LocationRequest; import org.eclipse.gef.tools.SelectionTool; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.jst.pagedesigner.PDPlugin; import org.eclipse.jst.pagedesigner.commands.DeleteNodeCommand; import org.eclipse.jst.pagedesigner.commands.SwitchSelectionCommand; import org.eclipse.jst.pagedesigner.commands.nav.HorizontalMoveCommand; import org.eclipse.jst.pagedesigner.commands.nav.ICaretPositionMover; import org.eclipse.jst.pagedesigner.commands.nav.VerticalMoveCommand; -import org.eclipse.jst.pagedesigner.commands.range.ContentCommand; import org.eclipse.jst.pagedesigner.commands.range.CopyCommand; import org.eclipse.jst.pagedesigner.commands.range.CutCommand; import org.eclipse.jst.pagedesigner.commands.range.DeleteCommand; @@ -32,7 +30,6 @@ import org.eclipse.jst.pagedesigner.commands.range.InsertCommand; import org.eclipse.jst.pagedesigner.commands.range.KeyboardData; import org.eclipse.jst.pagedesigner.commands.range.PasteCommand; import org.eclipse.jst.pagedesigner.commands.range.SelectAllCommand; -import org.eclipse.jst.pagedesigner.common.logging.Logger; import org.eclipse.jst.pagedesigner.editors.pagedesigner.PageDesignerResources; import org.eclipse.jst.pagedesigner.parts.DocumentEditPart; import org.eclipse.jst.pagedesigner.requests.LocationModifierRequest; @@ -45,8 +42,8 @@ import org.eclipse.swt.events.KeyEvent; * @author mengbo */ public class RangeSelectionTool extends SelectionTool { - static final private Logger _log = PDPlugin - .getLogger(RangeSelectionTool.class); +// static final private Logger _log = PDPlugin +// .getLogger(RangeSelectionTool.class); private LocationRequest _hoverRequest; @@ -166,9 +163,8 @@ public class RangeSelectionTool extends SelectionTool { "RangeSelectionTool.CommandLabel.Insert"), (IHTMLGraphicalViewer) this.getCurrentViewer(), keyCode); //$NON-NLS-1$ e.doit = false; break; - } else { - return super.handleKeyDown(e); } + return super.handleKeyDown(e); } } if (command != null) { @@ -239,21 +235,23 @@ public class RangeSelectionTool extends SelectionTool { * * @param e */ - private void dumpKey(KeyEvent e) { - String message = "code:" + Integer.toBinaryString(e.keyCode) + "char:" + e.character + "key:" + Integer.toBinaryString(e.stateMask); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - _log.info(message); - } - - /** - * @param content - */ - private boolean handleRangeModeContentChar(char content) { - IHTMLGraphicalViewer viewer = (IHTMLGraphicalViewer) this - .getCurrentViewer(); - ContentCommand c = new ContentCommand(viewer, content); - c.execute(); - return true; - } + + // TODO: dead? +// private void dumpKey(KeyEvent e) { +// String message = "code:" + Integer.toBinaryString(e.keyCode) + "char:" + e.character + "key:" + Integer.toBinaryString(e.stateMask); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ +// _log.info(message); +// } +// +// /** +// * @param content +// */ +// private boolean handleRangeModeContentChar(char content) { +// IHTMLGraphicalViewer viewer = (IHTMLGraphicalViewer) this +// .getCurrentViewer(); +// ContentCommand c = new ContentCommand(viewer, content); +// c.execute(); +// return true; +// } /* * (non-Javadoc) diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/common/CommonResourceDialog.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/common/CommonResourceDialog.java index 970f38088..74d5f98c1 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/common/CommonResourceDialog.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/common/CommonResourceDialog.java @@ -66,6 +66,7 @@ public class CommonResourceDialog extends TreeViewerSelectionDialog { * disposed. Deallocate all allocated SWT resources. */ public void dispose() { + // do nothing } /** @@ -169,6 +170,7 @@ public class CommonResourceDialog extends TreeViewerSelectionDialog { * @see IContentProvider#inputChanged */ public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + // do nothing } } @@ -233,9 +235,8 @@ public class CommonResourceDialog extends TreeViewerSelectionDialog { if (isWebAppProject(container) && this.isSameProject(container, _project)) { return true; - } else { - return false; } + return false; } else if (element instanceof IFolder) { IContainer container = (IContainer) element; try { @@ -285,7 +286,7 @@ public class CommonResourceDialog extends TreeViewerSelectionDialog { } private boolean isSameProject(IProject orig, IProject dst) { - String currentProjectName = ((IProject) orig).getFullPath() + String currentProjectName = orig.getFullPath() .toString().trim(); String projectName = dst.getFullPath().toString().trim(); return projectName.equalsIgnoreCase(currentProjectName); @@ -325,24 +326,23 @@ public class CommonResourceDialog extends TreeViewerSelectionDialog { protected boolean isValidSelection(Object selection) { if (getContainerFullPath(selection) == null) { return false; - } else { - int depth = getContainerFullPath(selection).segmentCount(); - // The location is within WEBROOT PATH? - if ((selection instanceof IFile) && depth >= WEBROOT_FOLDER_DEPTH) { - // Null means no filter is set - if (_suffixs == null) { - return true; - } - // The extension is supported? - else if (_suffixs != null - && Arrays.asList(_suffixs).contains( - ((IFile) selection).getFileExtension())) { - return true; - } - } - // None of above conditions, invalid. - return false; } + int depth = getContainerFullPath(selection).segmentCount(); + // The location is within WEBROOT PATH? + if ((selection instanceof IFile) && depth >= WEBROOT_FOLDER_DEPTH) { + // Null means no filter is set + if (_suffixs == null) { + return true; + } + // The extension is supported? + else if (_suffixs != null + && Arrays.asList(_suffixs).contains( + ((IFile) selection).getFileExtension())) { + return true; + } + } + // None of above conditions, invalid. + return false; } /* diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/common/PartActivationHandler.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/common/PartActivationHandler.java index e5e16907e..8cc20873e 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/common/PartActivationHandler.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/common/PartActivationHandler.java @@ -63,12 +63,14 @@ public abstract class PartActivationHandler extends ShellAdapter implements * @see IPartListener#partBroughtToTop(IWorkbenchPart) */ public void partBroughtToTop(IWorkbenchPart part) { + // do nothing } /** * @see IPartListener#partClosed(IWorkbenchPart) */ public void partClosed(IWorkbenchPart part) { + // do nothing } /** @@ -82,6 +84,7 @@ public abstract class PartActivationHandler extends ShellAdapter implements * @see IPartListener#partOpened(IWorkbenchPart) */ public void partOpened(IWorkbenchPart part) { + // do nothing } /* diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/common/ResourceOnClasspathDialog.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/common/ResourceOnClasspathDialog.java index 95f9fbcc9..cf6b3eaed 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/common/ResourceOnClasspathDialog.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/common/ResourceOnClasspathDialog.java @@ -111,9 +111,8 @@ public class ResourceOnClasspathDialog extends TreeViewerSelectionDialog { .toString().trim(); if (projectName.equalsIgnoreCase(currentProjectName)) { return true; - } else { - return false; } + return false; } else if (element instanceof IResource) { if (((_javaProject != null) && !_javaProject .isOnClasspath((IResource) element))) { @@ -133,9 +132,8 @@ public class ResourceOnClasspathDialog extends TreeViewerSelectionDialog { .getFileExtension(); if (ext != null && Arrays.asList(_suffixs).contains(ext)) { return true; - } else { - return false; } + return false; } if (!(element instanceof IJavaElement)) { return false; @@ -159,16 +157,14 @@ public class ResourceOnClasspathDialog extends TreeViewerSelectionDialog { if (Arrays.asList(_suffixs).contains( IFileFolderConstants.EXT_CLASS)) { return true; - } else { - return false; - } + } + return false; case IJavaElement.COMPILATION_UNIT: String ext = javaElement.getPath().getFileExtension(); if (ext != null && Arrays.asList(_suffixs).contains(ext)) { return true; - } else { - return false; - } + } + return false; default: return false; } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/common/TreeViewerSelectionDialog.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/common/TreeViewerSelectionDialog.java index f21b840ee..d1e881386 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/common/TreeViewerSelectionDialog.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/common/TreeViewerSelectionDialog.java @@ -134,7 +134,7 @@ public abstract class TreeViewerSelectionDialog extends SelectionDialog { _selection = getSelectedElement((IStructuredSelection) event .getSelection()); updateStatus(); - }; + } }); _treeViewer.addDoubleClickListener(new IDoubleClickListener() { public void doubleClick(DoubleClickEvent event) { @@ -224,7 +224,7 @@ public abstract class TreeViewerSelectionDialog extends SelectionDialog { } private Object getSelectedElement(IStructuredSelection selection) { - return ((IStructuredSelection) selection).getFirstElement(); + return selection.getFirstElement(); } /** diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/common/sash/SashEditorPart.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/common/sash/SashEditorPart.java index 1ae97b878..33d0cd2e1 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/common/sash/SashEditorPart.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/common/sash/SashEditorPart.java @@ -17,7 +17,7 @@ import java.util.Iterator; import java.util.Map; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.Platform; +import org.eclipse.core.runtime.SafeRunner; import org.eclipse.draw2d.ColorConstants; import org.eclipse.jface.util.SafeRunnable; import org.eclipse.jface.viewers.IPostSelectionProvider; @@ -404,7 +404,7 @@ public abstract class SashEditorPart extends EditorPart { * The part to dispose; must not be <code>null</code>. */ private void disposePart(final IWorkbenchPart part) { - Platform.run(new SafeRunnable() { + SafeRunner.run(new SafeRunnable() { public void run() { if (part.getSite() instanceof SashEditorSite) { SashEditorSite partSite = (SashEditorSite) part.getSite(); @@ -462,22 +462,21 @@ public abstract class SashEditorPart extends EditorPart { .log("MultiPageEditorPart.setFocus() Parent key binding service was not an instance of INestableKeyBindingService. It was an instance of " + service.getClass().getName() + " instead."); //$NON-NLS-1$ //$NON-NLS-2$ } return; - } else { - editor.setFocus(); - // There is no selected page, so deactivate the active service. - if (service instanceof INestableKeyBindingService) { - final INestableKeyBindingService nestableService = (INestableKeyBindingService) service; - if (editor != null) { - nestableService.activateKeyBindingService(editor - .getEditorSite()); - } else { - nestableService.activateKeyBindingService(null); - } - } else { - WorkbenchPlugin - .log("MultiPageEditorPart.setFocus() Parent key binding service was not an instance of INestableKeyBindingService. It was an instance of " + service.getClass().getName() + " instead."); //$NON-NLS-1$ //$NON-NLS-2$ - } } + editor.setFocus(); + // There is no selected page, so deactivate the active service. + if (service instanceof INestableKeyBindingService) { + final INestableKeyBindingService nestableService = (INestableKeyBindingService) service; + if (editor != null) { + nestableService.activateKeyBindingService(editor + .getEditorSite()); + } else { + nestableService.activateKeyBindingService(null); + } + } else { + WorkbenchPlugin + .log("MultiPageEditorPart.setFocus() Parent key binding service was not an instance of INestableKeyBindingService. It was an instance of " + service.getClass().getName() + " instead."); //$NON-NLS-1$ //$NON-NLS-2$ + } } public void doSave(IProgressMonitor monitor) { @@ -495,9 +494,10 @@ public abstract class SashEditorPart extends EditorPart { public boolean isSaveAsAllowed() { if (_activeEditor != null) + { return _activeEditor.isSaveAsAllowed(); - else - return false; + } + return false; } public void setOrientation(int orientation) { diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/common/sash/SashEditorSelectionProvider.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/common/sash/SashEditorSelectionProvider.java index 4a8cd363c..1dbe06cbc 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/common/sash/SashEditorSelectionProvider.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/common/sash/SashEditorSelectionProvider.java @@ -11,9 +11,9 @@ *******************************************************************************/ package org.eclipse.jst.pagedesigner.ui.common.sash; -import org.eclipse.core.runtime.Platform; +import org.eclipse.core.runtime.ListenerList; +import org.eclipse.core.runtime.SafeRunner; import org.eclipse.jface.util.Assert; -import org.eclipse.jface.util.ListenerList; import org.eclipse.jface.util.SafeRunnable; import org.eclipse.jface.viewers.IPostSelectionProvider; import org.eclipse.jface.viewers.ISelection; @@ -31,9 +31,9 @@ public class SashEditorSelectionProvider implements IPostSelectionProvider { * Registered selection changed listeners (element type: * <code>ISelectionChangedListener</code>). */ - private ListenerList _listeners = new ListenerList(); + private ListenerList _listeners = new ListenerList(ListenerList.IDENTITY); - private ListenerList _postSelectionChangedListeners = new ListenerList(1); + private ListenerList _postSelectionChangedListeners = new ListenerList(ListenerList.IDENTITY); /** * The multi-page editor. @@ -70,7 +70,7 @@ public class SashEditorSelectionProvider implements IPostSelectionProvider { Object[] listeners = this._listeners.getListeners(); for (int i = 0; i < listeners.length; ++i) { final ISelectionChangedListener l = (ISelectionChangedListener) listeners[i]; - Platform.run(new SafeRunnable() { + SafeRunner.run(new SafeRunnable() { public void run() { l.selectionChanged(event); } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogfields/DialogFieldWrapper.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogfields/DialogFieldWrapper.java index ce1d961a2..ff9a52edd 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogfields/DialogFieldWrapper.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogfields/DialogFieldWrapper.java @@ -100,9 +100,9 @@ public class DialogFieldWrapper implements DialogField, ISupportTextValue, * * @see org.eclipse.jst.pagedesigner.common.dialogfield.IStringButtonAdapter#changeControlPressed(org.eclipse.jst.pagedesigner.common.dialogfield.DialogField) */ - public void changeControlPressed(DialogField field) { - Shell shell = field.getLabelControl(null, null).getShell(); - DialogFieldWrapper wrapper = (DialogFieldWrapper) field; + public void changeControlPressed(DialogField field1) { + Shell shell = field1.getLabelControl(null, null).getShell(); + DialogFieldWrapper wrapper = (DialogFieldWrapper) field1; String result = _handler .handleBinding(shell, wrapper.getAncester(), wrapper .getElement(), wrapper.getText()); diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/BackgroudPreferenceNode.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/BackgroudPreferenceNode.java index c4a0f363e..20aaec743 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/BackgroudPreferenceNode.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/BackgroudPreferenceNode.java @@ -40,6 +40,7 @@ public class BackgroudPreferenceNode implements IPreferenceNode { * @see org.eclipse.jface.preference.IPreferenceNode#add(org.eclipse.jface.preference.IPreferenceNode) */ public void add(IPreferenceNode node) { + // TODO: do nothing? } /* @@ -57,6 +58,7 @@ public class BackgroudPreferenceNode implements IPreferenceNode { * @see org.eclipse.jface.preference.IPreferenceNode#disposeResources() */ public void disposeResources() { + //TODO: do nothing? } /* diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/BackgroundPreferencePage.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/BackgroundPreferencePage.java index e23a77e78..db91ae5fc 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/BackgroundPreferencePage.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/BackgroundPreferencePage.java @@ -310,8 +310,7 @@ public class BackgroundPreferencePage extends PreferencePage { private boolean isEmptyString(String str) { if (str == null || str.length() == 0) { return true; - } else { - return false; } + return false; } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/BlockPreferenceNode.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/BlockPreferenceNode.java index a03747d70..988295fcc 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/BlockPreferenceNode.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/BlockPreferenceNode.java @@ -40,6 +40,7 @@ public class BlockPreferenceNode implements IPreferenceNode { * @see org.eclipse.jface.preference.IPreferenceNode#add(org.eclipse.jface.preference.IPreferenceNode) */ public void add(IPreferenceNode node) { + // TODO: do nothing? } /* @@ -57,6 +58,7 @@ public class BlockPreferenceNode implements IPreferenceNode { * @see org.eclipse.jface.preference.IPreferenceNode#disposeResources() */ public void disposeResources() { + // TODO: do nothing? } /* diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/BlockPreferencePage.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/BlockPreferencePage.java index 51006ed51..8d5215c8d 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/BlockPreferencePage.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/BlockPreferencePage.java @@ -384,11 +384,11 @@ public class BlockPreferencePage extends PreferencePage { getDefaultsButton().setVisible(false); } + // TODO: seeing this method repeated in on other preference pages.. private boolean isEmptyString(String str) { if (str == null || str.length() == 0) { return true; - } else { - return false; } + return false; } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/BorderPreferenceNode.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/BorderPreferenceNode.java index de068c673..e3a4febf7 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/BorderPreferenceNode.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/BorderPreferenceNode.java @@ -40,6 +40,7 @@ public class BorderPreferenceNode implements IPreferenceNode { * @see org.eclipse.jface.preference.IPreferenceNode#add(org.eclipse.jface.preference.IPreferenceNode) */ public void add(IPreferenceNode node) { + // TODO: do nothing? } /* @@ -57,6 +58,7 @@ public class BorderPreferenceNode implements IPreferenceNode { * @see org.eclipse.jface.preference.IPreferenceNode#disposeResources() */ public void disposeResources() { + // TODO: do nothing? } /* diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/BorderPreferencePage.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/BorderPreferencePage.java index e9ba4d9df..5460ad23c 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/BorderPreferencePage.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/BorderPreferencePage.java @@ -528,8 +528,7 @@ public class BorderPreferencePage extends PreferencePage { private boolean isEmptyString(String str) { if (str == null || str.length() == 0) { return true; - } else { - return false; } + return false; } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/BoxPreferenceNode.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/BoxPreferenceNode.java index 64ac5b91b..106bf8365 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/BoxPreferenceNode.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/BoxPreferenceNode.java @@ -40,6 +40,7 @@ public class BoxPreferenceNode implements IPreferenceNode { * @see org.eclipse.jface.preference.IPreferenceNode#add(org.eclipse.jface.preference.IPreferenceNode) */ public void add(IPreferenceNode node) { + // TODO: this pattern is being repeated; perhaps need common super for preference nodes? } /* @@ -57,6 +58,7 @@ public class BoxPreferenceNode implements IPreferenceNode { * @see org.eclipse.jface.preference.IPreferenceNode#disposeResources() */ public void disposeResources() { + // TODO: } /* diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/BoxPreferencePage.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/BoxPreferencePage.java index 2a26134ee..450355c71 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/BoxPreferencePage.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/BoxPreferencePage.java @@ -341,12 +341,12 @@ public class BoxPreferencePage extends PreferencePage { _paddingLeftUnitCombo.setEnabled(false); } - String top = _paddingLeftNumberText.getText(); + String top1 = _paddingLeftNumberText.getText(); if (_paddingLeftUnitCombo.isEnabled()) { - top += _paddingLeftUnitCombo.getText(); + top1 += _paddingLeftUnitCombo.getText(); } - _style.setPaddingLeft(top); + _style.setPaddingLeft(top1); } }); @@ -358,12 +358,12 @@ public class BoxPreferencePage extends PreferencePage { _paddingLeftUnitCombo.setEnabled(false); _paddingLeftUnitCombo.addModifyListener(new ModifyListener() { public void modifyText(ModifyEvent e) { - String top = _paddingLeftNumberText.getText(); + String top1 = _paddingLeftNumberText.getText(); if (_paddingLeftUnitCombo.isEnabled()) { - top += _paddingLeftUnitCombo.getText(); + top1 += _paddingLeftUnitCombo.getText(); } - _style.setPaddingLeft(top); + _style.setPaddingLeft(top1); } }); @@ -531,12 +531,12 @@ public class BoxPreferencePage extends PreferencePage { _marginLeftUnitCombo.setEnabled(false); } - String top = _marginLeftNumberCombo.getText(); + String top1 = _marginLeftNumberCombo.getText(); if (_marginLeftUnitCombo.isEnabled()) { - top += _marginLeftUnitCombo.getText(); + top1 += _marginLeftUnitCombo.getText(); } - _style.setMarginLeft(top); + _style.setMarginLeft(top1); } }); @@ -548,12 +548,12 @@ public class BoxPreferencePage extends PreferencePage { _marginLeftUnitCombo.setEnabled(false); _marginLeftUnitCombo.addModifyListener(new ModifyListener() { public void modifyText(ModifyEvent e) { - String top = _marginLeftNumberCombo.getText(); + String top1 = _marginLeftNumberCombo.getText(); if (_marginLeftUnitCombo.isEnabled()) { - top += _marginLeftUnitCombo.getText(); + top1 += _marginLeftUnitCombo.getText(); } - _style.setMarginLeft(top); + _style.setMarginLeft(top1); } }); @@ -663,8 +663,7 @@ public class BoxPreferencePage extends PreferencePage { private boolean isEmptyString(String str) { if (str == null || str.length() == 0) { return true; - } else { - return false; } + return false; } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/DialogsMessages.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/DialogsMessages.java index d12ee1473..60db23c5a 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/DialogsMessages.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/DialogsMessages.java @@ -25,6 +25,7 @@ public class DialogsMessages { .getBundle(BUNDLE_NAME); private DialogsMessages() { + // no external instantiation } public static String getString(String key) { diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/ExtensionsPreferenceNode.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/ExtensionsPreferenceNode.java index 1b3c5509b..1ac4ce7ba 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/ExtensionsPreferenceNode.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/ExtensionsPreferenceNode.java @@ -41,6 +41,7 @@ public class ExtensionsPreferenceNode implements IPreferenceNode { * @see org.eclipse.jface.preference.IPreferenceNode#add(org.eclipse.jface.preference.IPreferenceNode) */ public void add(IPreferenceNode node) { + // TODO: } /* @@ -58,6 +59,7 @@ public class ExtensionsPreferenceNode implements IPreferenceNode { * @see org.eclipse.jface.preference.IPreferenceNode#disposeResources() */ public void disposeResources() { + // TODO: } /* diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/ExtensionsPreferencePage.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/ExtensionsPreferencePage.java index 73bf4e4eb..81dc433be 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/ExtensionsPreferencePage.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/ExtensionsPreferencePage.java @@ -172,8 +172,7 @@ public class ExtensionsPreferencePage extends PreferencePage { private boolean isEmptyString(String str) { if (str == null || str.length() == 0) { return true; - } else { - return false; } + return false; } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/ListPreferenceNode.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/ListPreferenceNode.java index 4b8859fc6..334afe443 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/ListPreferenceNode.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/ListPreferenceNode.java @@ -40,6 +40,7 @@ public class ListPreferenceNode implements IPreferenceNode { * @see org.eclipse.jface.preference.IPreferenceNode#add(org.eclipse.jface.preference.IPreferenceNode) */ public void add(IPreferenceNode node) { + // TODO: } /* @@ -57,6 +58,7 @@ public class ListPreferenceNode implements IPreferenceNode { * @see org.eclipse.jface.preference.IPreferenceNode#disposeResources() */ public void disposeResources() { + // TODO: } /* diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/ListPreferencePage.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/ListPreferencePage.java index 9192e59f4..078e7e3fa 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/ListPreferencePage.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/ListPreferencePage.java @@ -153,8 +153,7 @@ public class ListPreferencePage extends PreferencePage { private boolean isEmptyString(String str) { if (str == null || str.length() == 0) { return true; - } else { - return false; } + return false; } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/PositioningPreferenceNode.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/PositioningPreferenceNode.java index d5641831a..f46dd07d9 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/PositioningPreferenceNode.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/PositioningPreferenceNode.java @@ -41,6 +41,7 @@ public class PositioningPreferenceNode implements IPreferenceNode { * @see org.eclipse.jface.preference.IPreferenceNode#add(org.eclipse.jface.preference.IPreferenceNode) */ public void add(IPreferenceNode node) { + // TODO: } /* @@ -58,6 +59,7 @@ public class PositioningPreferenceNode implements IPreferenceNode { * @see org.eclipse.jface.preference.IPreferenceNode#disposeResources() */ public void disposeResources() { + // TODO: } /* diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/PositioningPreferencePage.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/PositioningPreferencePage.java index 703c25055..415ff9182 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/PositioningPreferencePage.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/PositioningPreferencePage.java @@ -397,12 +397,12 @@ public class PositioningPreferencePage extends PreferencePage { _placementLeftUnitCombo.setEnabled(false); } - String top = _placementLeftNumberCombo.getText(); + String top1 = _placementLeftNumberCombo.getText(); if (_placementLeftUnitCombo.isEnabled()) { - top += _placementLeftUnitCombo.getText(); + top1 += _placementLeftUnitCombo.getText(); } - _style.setLeft(top); + _style.setLeft(top1); } }); @@ -414,12 +414,12 @@ public class PositioningPreferencePage extends PreferencePage { _placementLeftUnitCombo.setEnabled(false); _placementLeftUnitCombo.addModifyListener(new ModifyListener() { public void modifyText(ModifyEvent e) { - String top = _placementLeftNumberCombo.getText(); + String top1 = _placementLeftNumberCombo.getText(); if (_placementLeftUnitCombo.isEnabled()) { - top += _placementLeftUnitCombo.getText(); + top1 += _placementLeftUnitCombo.getText(); } - _style.setLeft(top); + _style.setLeft(top1); } }); @@ -587,12 +587,12 @@ public class PositioningPreferencePage extends PreferencePage { _clipLeftUnitCombo.setEnabled(false); } - String top = _clipLeftNumberCombo.getText(); + String top1 = _clipLeftNumberCombo.getText(); if (_clipLeftUnitCombo.isEnabled()) { - top += _clipLeftUnitCombo.getText(); + top1 += _clipLeftUnitCombo.getText(); } - _style.setClipLeft(top); + _style.setClipLeft(top1); } }); @@ -604,12 +604,12 @@ public class PositioningPreferencePage extends PreferencePage { _clipLeftUnitCombo.setEnabled(false); _clipLeftUnitCombo.addModifyListener(new ModifyListener() { public void modifyText(ModifyEvent e) { - String top = _clipLeftNumberCombo.getText(); + String top1 = _clipLeftNumberCombo.getText(); if (_clipLeftUnitCombo.isEnabled()) { - top += _clipLeftUnitCombo.getText(); + top1 += _clipLeftUnitCombo.getText(); } - _style.setClipLeft(top); + _style.setClipLeft(top1); } }); @@ -772,8 +772,7 @@ public class PositioningPreferencePage extends PreferencePage { private boolean isEmptyString(String str) { if (str == null || str.length() == 0) { return true; - } else { - return false; - } + } + return false; } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/StyleCombo.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/StyleCombo.java index 6e1efb31a..e50a885cf 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/StyleCombo.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/StyleCombo.java @@ -38,5 +38,7 @@ public class StyleCombo extends Combo { } protected void checkSubclass() { + // override subclass validation, otherwise Widget.isValidSubclass + // will throw an error } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/TextPreferenceNode.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/TextPreferenceNode.java index 5c6ca8888..c279c693f 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/TextPreferenceNode.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/TextPreferenceNode.java @@ -40,6 +40,7 @@ public class TextPreferenceNode implements IPreferenceNode { * @see org.eclipse.jface.preference.IPreferenceNode#add(org.eclipse.jface.preference.IPreferenceNode) */ public void add(IPreferenceNode node) { + // TODO: } /* @@ -57,6 +58,7 @@ public class TextPreferenceNode implements IPreferenceNode { * @see org.eclipse.jface.preference.IPreferenceNode#disposeResources() */ public void disposeResources() { + // TODO: } /* diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/TextPreferencePage.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/TextPreferencePage.java index da9ff6b14..6ad9b9126 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/TextPreferencePage.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/TextPreferencePage.java @@ -515,8 +515,7 @@ public class TextPreferencePage extends PreferencePage { private boolean isEmptyString(String str) { if (str == null || str.length() == 0) { return true; - } else { - return false; } + return false; } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/BodyHelper.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/BodyHelper.java index ba0cf0a65..6aa70eae4 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/BodyHelper.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/BodyHelper.java @@ -113,8 +113,8 @@ public class BodyHelper { | HEADER)) { reference = reference.getNextSibling(); continue; - } else - break; + } + break; } // backward @@ -132,8 +132,8 @@ public class BodyHelper { if (isSkippableChild(container, reference, EMPTY_TEXT | COMMENT)) { reference = reference.getPreviousSibling(); continue; - } else - break; + } + break; } // not find any body at same level as the insertion point. @@ -177,38 +177,33 @@ public class BodyHelper { // try to find a body container at same level and see whether we can // move into that body. return findBodyInsertLocation(position); - } else { - // good, we find a body container and the new node should be header - // of it. - Node child = headerContainer.getFirstChild(); - Node refNode = position.getNextSiblingNode(); - // if parent is different from headerContainer, then - // child!=referenceHolder[0] will always be true - while (child != null) // && child != refNode) - { - Comparator comp = NodeLocationComparator.getInstance(); - // Currently the comparator deels with tags like taglib and - // loadbundle particularly, comparasion result 0 - // means it didn't compare the tags. - if (comp.compare(child, tag) < 0 - || (comp.compare(child, tag) == 0 && isSkippableChild( - headerContainer, child, COMMENT | EMPTY_TEXT - | HEADER))) { - child = child.getNextSibling(); - } else { - break; - } - } - if (child != null) { - return new DOMRefPosition(child, false); - } else { - return new DOMPosition(parent, parent.getChildNodes() - .getLength()); - } - // parentHolder[0] = headerContainer; - // referenceHolder[0] = child; - // return; } + // good, we find a body container and the new node should be header + // of it. + Node child = headerContainer.getFirstChild(); + // TODO: dead? Node refNode = position.getNextSiblingNode(); + // if parent is different from headerContainer, then + // child!=referenceHolder[0] will always be true + while (child != null) // && child != refNode) + { + Comparator comp = NodeLocationComparator.getInstance(); + // Currently the comparator deels with tags like taglib and + // loadbundle particularly, comparasion result 0 + // means it didn't compare the tags. + if (comp.compare(child, tag) < 0 + || (comp.compare(child, tag) == 0 && isSkippableChild( + headerContainer, child, COMMENT | EMPTY_TEXT + | HEADER))) { + child = child.getNextSibling(); + } else { + break; + } + } + if (child != null) { + return new DOMRefPosition(child, false); + } + return new DOMPosition(parent, parent.getChildNodes() + .getLength()); } /** @@ -271,7 +266,7 @@ public class BodyHelper { NodeList nl = node.getChildNodes(); ArrayList list = new ArrayList(); for (int i = 0; i < nl.getLength(); i++) { - Node child = (Node) nl.item(i); + Node child = nl.item(i); if (isSkippableChild(node, child, HEADER | COMMENT | EMPTY_TEXT)) { continue; @@ -292,9 +287,8 @@ public class BodyHelper { } else { return new DOMPosition(ele, 0); } - } else { - return position; } + return position; } node = node.getParentNode(); } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/CMUtil.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/CMUtil.java index b5cc8c305..ca460cf2e 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/CMUtil.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/CMUtil.java @@ -101,9 +101,8 @@ public class CMUtil { } if (decl instanceof TLDElementDeclaration) { return (TLDElementDeclaration) decl; - } else { - return null; } + return null; } /** diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/CacheManager.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/CacheManager.java index 114766820..5f513f4ab 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/CacheManager.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/CacheManager.java @@ -56,11 +56,10 @@ public class CacheManager { _keys.addLast(key); _map.put(key, result); return result; - } else { - _keys.remove(key); - _keys.addLast(key); - return result; } + _keys.remove(key); + _keys.addLast(key); + return result; } public void disposeAll() { diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/CommandUtil.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/CommandUtil.java index e3f30daef..18ca1b426 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/CommandUtil.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/CommandUtil.java @@ -112,9 +112,8 @@ public class CommandUtil { if (item.isJSFComponent()) { return JSFValidatorSupport.prepareInsertJSFComponent(position, item .getURI(), item.getTagName(), item.isRequireHForm()); - } else { - return position; } + return position; } // /** diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/DOMUtil.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/DOMUtil.java index 3ef4425b4..c26658001 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/DOMUtil.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/DOMUtil.java @@ -123,13 +123,12 @@ public class DOMUtil { String attrvalue = getAttributeIgnoreCase(ele, attr); if (attrvalue == null) { return defaultvalue; - } else { - try { - return Integer.parseInt(attrvalue); - } catch (Exception ex) { - return defaultvalue; - } } + try { + return Integer.parseInt(attrvalue); + } catch (NumberFormatException ex) { + return defaultvalue; + } } /** diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/EntityMap.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/EntityMap.java index 3d74044d9..6443fddcc 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/EntityMap.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/EntityMap.java @@ -39,9 +39,10 @@ public class EntityMap { } while (posi < len) { if (!Character.isLetterOrDigit(array[posi])) + { break; - else - posi++; + } + posi++; } // now posi>=array.length or array[posi] is non letter or digit String str = new String(array, lastPosi, posi - lastPosi); @@ -72,8 +73,12 @@ public class EntityMap { while (posi < len) { if (HTMLUtil.isHTMLWhitespace(array[posi])) { while (++posi < len && HTMLUtil.isHTMLWhitespace(array[posi])) - ; - buffer.append(' '); + { + // no body + // loop until we have find non-whitepspace or endof array + } + + buffer.append(' '); continue; } if (array[posi] != '&') { @@ -90,9 +95,8 @@ public class EntityMap { while (posi < len) { if (!Character.isLetterOrDigit(array[posi])) { break; - } else { - posi++; } + posi++; } // now posi>=array.length or array[posi] is non letter or digit String str = new String(array, lastPosi, posi - lastPosi); @@ -145,10 +149,9 @@ public class EntityMap { strBuf.append(s); return false; } - } else { - strBuf.append(s); - return false; } + strBuf.append(s); + return false; } /** @@ -162,7 +165,7 @@ public class EntityMap { private static char replaceBadEntity(char n) { if (n < 132 || n > 156) return n; - switch ((int) n) { + switch (n) { case 132: return (char) 8222; case 133: diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/HTMLSpecialCharHelper.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/HTMLSpecialCharHelper.java index 6d7539f17..f79007d6e 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/HTMLSpecialCharHelper.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/HTMLSpecialCharHelper.java @@ -310,22 +310,21 @@ public class HTMLSpecialCharHelper { Integer result = (Integer) _reverse.get(str); if (result == null) { return -1; - } else { - return result.intValue(); } + return result.intValue(); } public static void encode(String str, int start, int end, Writer writer) throws IOException { for (int i = start; i < end; i++) { char ch = str.charAt(i); - String special = getSpecial((int) ch); + String special = getSpecial(ch); if (special != null) { writer.write(special); } else { if ((ch & 0xff) != 0) { writer.write("&#"); //$NON-NLS-1$ - writer.write(Integer.toString((int) ch)); + writer.write(Integer.toString(ch)); writer.write(";"); //$NON-NLS-1$ } else { writer.write(ch); @@ -342,13 +341,13 @@ public class HTMLSpecialCharHelper { StringBuffer result) { for (int i = start; i < end; i++) { char ch = str.charAt(i); - String special = getSpecial((int) ch); + String special = getSpecial(ch); if (special != null) { result.append(special); } else { if ((ch & 0xff00) != 0) { result.append("&#"); //$NON-NLS-1$ - result.append(Integer.toString((int) ch)); + result.append(Integer.toString(ch)); result.append(";"); //$NON-NLS-1$ } else { result.append(ch); diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/HTMLUtil.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/HTMLUtil.java index 0d9111ec8..f46985829 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/HTMLUtil.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/HTMLUtil.java @@ -83,7 +83,11 @@ public class HTMLUtil { while (posi < len) { if (HTMLUtil.isHTMLWhitespace(array[posi])) { while (++posi < len && HTMLUtil.isHTMLWhitespace(array[posi])) - ; + { + // no body + // loop until we have find non-whitepspace or endof array + } + buffer.append(' '); continue; } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/IntFlexArray.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/IntFlexArray.java index e90b41695..0e2ccc19e 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/IntFlexArray.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/IntFlexArray.java @@ -42,16 +42,15 @@ public class IntFlexArray { public int getAt(int idx) { if (idx < array.length) return array[idx]; - else - return 0; + return 0; } public int getSize() { return size; } - private void ensureCapacity(int size) { - if (size <= array.length) + private void ensureCapacity(int size1) { + if (size1 <= array.length) return; int[] temp = array; array = new int[2 * temp.length]; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/JSPUtil.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/JSPUtil.java index 57c4caa92..fc703842a 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/JSPUtil.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/JSPUtil.java @@ -104,13 +104,12 @@ public class JSPUtil { TaglibTracker tracker = (TaglibTracker) iter.next(); if (uri.equals(tracker.getURI())) { return tracker.getPrefix(); - } else { - CMDocument cmdoc = tracker.getDocument(); - if (cmdoc instanceof TLDDocument - && uri.equals(((TLDDocument) cmdoc).getUri())) { - return tracker.getPrefix(); - } } + CMDocument cmdoc = tracker.getDocument(); + if (cmdoc instanceof TLDDocument + && uri.equals(((TLDDocument) cmdoc).getUri())) { + return tracker.getPrefix(); + } } return null; } @@ -184,9 +183,8 @@ public class JSPUtil { CMDocument cmdoc = tracker.getDocument(); if (cmdoc instanceof TLDDocument) { return ((TLDDocument) cmdoc).getUri(); - } else { - return null; } + break; // fall out and return null } } return null; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/NodeLocationComparator.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/NodeLocationComparator.java index 21ea6a1ba..a7edc5e41 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/NodeLocationComparator.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/NodeLocationComparator.java @@ -36,6 +36,7 @@ public class NodeLocationComparator implements Comparator { } private NodeLocationComparator() { + // no external instantiation } public static NodeLocationComparator getInstance() { diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/PreviewUtil.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/PreviewUtil.java index 92321f445..ad28de309 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/PreviewUtil.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/PreviewUtil.java @@ -64,7 +64,7 @@ public class PreviewUtil { /** key is prefix value is uri */ private static Map _taglibMap = new HashMap(); - private static final String PAGE_EXTEND = "_jsppreview_.html"; //$NON-NLS-1$ + // TODO: dead? private static final String PAGE_EXTEND = "_jsppreview_.html"; //$NON-NLS-1$ /** * @return Returns the _taglibMap. @@ -121,9 +121,8 @@ public class PreviewUtil { File file = new File(aPath); if (file.exists()) { return aPath; - } else { - return uri; } + return uri; } } } @@ -157,9 +156,8 @@ public class PreviewUtil { value = bundle.getString(key); if (value != null) { return value; - } else { - return attrValue; //$NON-NLS-1$ } + return attrValue; //$NON-NLS-1$ } catch (MissingResourceException e1) { // "Error in resource bundle processing:" _log.info("PreviewUtil.Error.0", e1); //$NON-NLS-1$ @@ -300,8 +298,9 @@ public class PreviewUtil { attr.setNodeValue(getValueOFEP(attr.getNodeValue())); attr.setNodeValue(PathUtil.convertToAbsolutePath(attr .getNodeValue(), null)); - StringBuffer buf = new StringBuffer(); - String attrValue = attr.getNodeValue(); + //TODO: dead? +// StringBuffer buf = new StringBuffer(); +// String attrValue = attr.getNodeValue(); } } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/ProjectResolver.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/ProjectResolver.java index 7b119630a..dc03d4ee9 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/ProjectResolver.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/ProjectResolver.java @@ -37,8 +37,8 @@ import org.eclipse.jst.pagedesigner.common.utils.ResourceUtils; import org.eclipse.jst.pagedesigner.common.utils.WebrootUtil; import org.eclipse.jst.pagedesigner.css2.property.ICSSPropertyID; import org.eclipse.wst.common.uriresolver.internal.util.URIHelper; +import org.eclipse.wst.sse.core.StructuredModelManager; import org.eclipse.wst.sse.core.internal.provisional.IModelManager; -import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager; import org.eclipse.wst.sse.core.internal.util.URIResolver; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; import org.w3c.dom.DOMException; @@ -153,7 +153,7 @@ public class ProjectResolver implements URIResolver { } catch (FileNotFoundException e) { _log.error("RenderingTraverser.Error.FileNotFound", e); } - IDOMModel xmlModel = null; +// IDOMModel xmlModel = null; try { tldModel = (IDOMModel) PDPlugin.getModelManager().getModelForRead( diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/SelectManyHelper.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/SelectManyHelper.java index 6fd8d89d9..bd8c627ee 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/SelectManyHelper.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/SelectManyHelper.java @@ -30,11 +30,11 @@ import org.w3c.dom.NodeList; * @author mengbo */ public class SelectManyHelper { - private static final String OPTION_VISUAL_PREFIX = "option: "; //$NON-NLS-1$ - - private static final String OPTION_VISUAL_PREFIX_BINDING = "option(binding): "; //$NON-NLS-1$ - - private static final String OPTION_VISUAL_PREFIX_VALUE = "option(value): "; //$NON-NLS-1$ +// private static final String OPTION_VISUAL_PREFIX = "option: "; //$NON-NLS-1$ +// +// private static final String OPTION_VISUAL_PREFIX_BINDING = "option(binding): "; //$NON-NLS-1$ +// +// private static final String OPTION_VISUAL_PREFIX_VALUE = "option(value): "; //$NON-NLS-1$ private static final String NO_VALUE = "<no value>"; //$NON-NLS-1$ @@ -160,9 +160,8 @@ public class SelectManyHelper { NodeList nl1 = node.getElementsByTagName(jsfcorePrefix + ":" + IJSFConstants.TAG_SELECTITEMS); return nl.getLength() > 0 || nl1.getLength() > 0; - } else { - return false; } + return false; } } if (IJMTConstants.URI_HTML.equals(uri)) { @@ -204,8 +203,7 @@ public class SelectManyHelper { */ if (element != null) { return element.getNodeName(); - } else { - return NO_VALUE; } + return NO_VALUE; } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/SelectionHelper.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/SelectionHelper.java index 7e79be45a..3b05b977b 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/SelectionHelper.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/SelectionHelper.java @@ -63,9 +63,8 @@ public class SelectionHelper { Object inode = model.getIndexedRegion(textSel.getOffset()); if (inode instanceof Node) { return (Node) inode; - } else { - return null; } + return null; } /** @@ -100,9 +99,8 @@ public class SelectionHelper { Node node1 = range.getStartPosition().getContainerNode(); Node node2 = range.getEndPosition().getContainerNode(); return DOMUtil.findCommonAncester(node1, node2); - } else { - return null; } + return null; } /** @@ -149,7 +147,7 @@ public class SelectionHelper { IStructuredDocumentRegion r = node .getFirstStructuredDocumentRegion(); int countedData = 0; - int offsetInNode = offset - start; + // TODO: dead? int offsetInNode = offset - start; while (r != null) { if (DOMRegionContext.XML_CHAR_REFERENCE.equals(r.getType()) || DOMRegionContext.XML_ENTITY_REFERENCE.equals(r @@ -182,17 +180,15 @@ public class SelectionHelper { .getStartStructuredDocumentRegion(); if (startRegion == null) { return new DOMRefPosition(node, true); - } else { - int startRegionEnd = node.getStartStructuredDocumentRegion() - .getEnd(); - if (offset <= startRegionEnd) { - // it is in the start tag region. So put position at first - // child position. - return new DOMRefPosition2(node, false); - } else { - return new DOMRefPosition2(node, true); - } } + int startRegionEnd = node.getStartStructuredDocumentRegion() + .getEnd(); + if (offset <= startRegionEnd) { + // it is in the start tag region. So put position at first + // child position. + return new DOMRefPosition2(node, false); + } + return new DOMRefPosition2(node, true); } else { return new DOMRefPosition(node, true); } @@ -295,24 +291,22 @@ public class SelectionHelper { r = r.getNext(); } return parent.getStartOffset() + p.getOffset(); - } else { - IDOMNode previous = (IDOMNode) p.getPreviousSiblingNode(); - if (previous != null) { - return previous.getEndOffset(); - } - IDOMNode next = (IDOMNode) p.getNextSiblingNode(); - if (next != null) { - return next.getStartOffset(); - } - IStructuredDocumentRegion r = parent - .getStartStructuredDocumentRegion(); - if (r != null) { - return r.getEnd(); - } else { - // r == null normally means the parent is the document node. - return parent.getEndOffset(); - } } + IDOMNode previous = (IDOMNode) p.getPreviousSiblingNode(); + if (previous != null) { + return previous.getEndOffset(); + } + IDOMNode next = (IDOMNode) p.getNextSiblingNode(); + if (next != null) { + return next.getStartOffset(); + } + IStructuredDocumentRegion r = parent + .getStartStructuredDocumentRegion(); + if (r != null) { + return r.getEnd(); + } + // r == null normally means the parent is the document node. + return parent.getEndOffset(); } /** @@ -332,9 +326,8 @@ public class SelectionHelper { result.add(part.getIDOMNode()); } return new StructuredSelection(result); - } else { - return new StructuredSelection(); } + return new StructuredSelection(); } /** @@ -361,12 +354,9 @@ public class SelectionHelper { endoffset = temp; } return new TextSelection(offset, endoffset - offset); - } else { - return new TextSelection(0, 0); - } - } else { - return new TextSelection(0, 0); + } } + return new TextSelection(0, 0); } public static ITextSelection convertFromDesignSelectionToTextSelection( @@ -378,13 +368,10 @@ public class SelectionHelper { return new TextSelection(node.getStartOffset(), node .getEndOffset() - node.getStartOffset()); - } else { - return new TextSelection(0, 0); } } else if (selection instanceof DesignRange) { return convertFromDesignSelection((DesignRange) selection); - } else { - return new TextSelection(0, 0); } + return new TextSelection(0, 0); } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/UriAdapterFactory.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/UriAdapterFactory.java index 7a717b329..4bad85a5d 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/UriAdapterFactory.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/UriAdapterFactory.java @@ -13,8 +13,6 @@ package org.eclipse.jst.pagedesigner.utils; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IAdapterFactory; -import org.eclipse.jst.pagedesigner.PDPlugin; -import org.eclipse.jst.pagedesigner.common.logging.Logger; import org.eclipse.wst.sse.core.internal.util.URIResolver; /** @@ -23,7 +21,7 @@ import org.eclipse.wst.sse.core.internal.util.URIResolver; */ public class UriAdapterFactory implements IAdapterFactory { /** Create the logger for this class */ - private static Logger _log = PDPlugin.getLogger(UriAdapterFactory.class); + //private static Logger _log = PDPlugin.getLogger(UriAdapterFactory.class); /* * (non-Javadoc) diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/BasicPositionRule.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/BasicPositionRule.java index f64159f11..90f1f5680 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/BasicPositionRule.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/BasicPositionRule.java @@ -41,8 +41,8 @@ public class BasicPositionRule extends DefaultPositionRule { if (!EditValidateUtil.validNode(target.getNode())) { return false; } - Node node = target.getNode(); - String name = node.getLocalName(); + // TODO: dead? Node node = target.getNode(); + //TODO: dead? String name = node.getLocalName(); if (DefaultPositionRule.isWidget(target.getPart())) { return false; } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/DefaultPositionRule.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/DefaultPositionRule.java index 70bf749b0..70987e8a5 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/DefaultPositionRule.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/DefaultPositionRule.java @@ -101,8 +101,7 @@ public class DefaultPositionRule implements IPositionRule { public static boolean isWidget(EditPart host) { if (host instanceof NodeEditPart) { return ((NodeEditPart) host).isWidget(); - } else { - return false; } + return false; } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/DefaultPositionValidator.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/DefaultPositionValidator.java index 34d0a15ff..eb1530005 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/DefaultPositionValidator.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/DefaultPositionValidator.java @@ -82,9 +82,9 @@ public class DefaultPositionValidator implements IPositionMediator { */ public boolean hasEditableArea(Target target) { boolean result = true; - List _rules = getRules(); - for (int i = 0, n = _rules.size(); i < n; i++) { - Object rule = _rules.get(i); + List rules = getRules(); + for (int i = 0, n = rules.size(); i < n; i++) { + Object rule = rules.get(i); if (rule instanceof IPositionRule) { result &= ((IPositionRule) rule).hasEditableArea(target); } @@ -103,9 +103,9 @@ public class DefaultPositionValidator implements IPositionMediator { public boolean isEditable(Target target) { Node node = target.getNode(); boolean result = true; - List _rules = getRules(); - for (int i = 0, n = _rules.size(); i < n; i++) { - Object rule = _rules.get(i); + List rules = getRules(); + for (int i = 0, n = rules.size(); i < n; i++) { + Object rule = rules.get(i); if (rule instanceof IPositionRule) { result &= ((IPositionRule) rule).isEditable(new Target(node)); } @@ -136,9 +136,9 @@ public class DefaultPositionValidator implements IPositionMediator { if (position == null) { return false; } - List _rules = getRules(); - for (int i = 0, n = _rules.size(); i < n; i++) { - Object rule = _rules.get(i); + List rules = getRules(); + for (int i = 0, n = rules.size(); i < n; i++) { + Object rule = rules.get(i); if (rule instanceof IPositionRule) { // editable? result &= ((IPositionRule) rule).isEditable(new Target(position @@ -208,9 +208,9 @@ public class DefaultPositionValidator implements IPositionMediator { */ public boolean canReference(Target target, boolean atRight) { boolean result = true; - List _rules = getRules(); - for (int i = 0, n = _rules.size(); i < n; i++) { - Object rule = _rules.get(i); + List rules = getRules(); + for (int i = 0, n = rules.size(); i < n; i++) { + Object rule = rules.get(i); if (rule instanceof IPositionRule) { result &= ((IPositionRule) rule).canReference(target, atRight); } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/DnDPositionValidator.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/DnDPositionValidator.java index 31e128f68..d011d84dd 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/DnDPositionValidator.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/DnDPositionValidator.java @@ -16,17 +16,18 @@ package org.eclipse.jst.pagedesigner.validation.caret; * screen. * * @author mengbo + * TODO: is this class complete? */ public class DnDPositionValidator extends DefaultPositionValidator { - private static DnDPositionValidator _instance; - - private ActionData _data; + //TODO: not used +// private static DnDPositionValidator _instance; +// +// private ActionData _data; /** * @param actionData */ public DnDPositionValidator(ActionData actionData) { super(actionData); - // TODO Auto-generated constructor stub } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/IETablePositionRule.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/IETablePositionRule.java index 488a910a9..9bcda2eec 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/IETablePositionRule.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/IETablePositionRule.java @@ -184,18 +184,19 @@ public class IETablePositionRule extends DefaultPositionRule { return false; } - private boolean isValidTrTd(List ancestors) { - String name; - int offset = ancestors.size(); - if (offset >= 2) { - return IHTMLConstants.TAG_TR.equalsIgnoreCase(((Node) ancestors - .get(offset - 1)).getLocalName()) - && // - (IHTMLConstants.TAG_TH.equalsIgnoreCase(((Node) ancestors - .get(offset - 2)).getLocalName()) || // - IHTMLConstants.TAG_TD.equalsIgnoreCase(((Node) ancestors - .get(offset - 2)).getLocalName())); - } - return false; - } + // TODO: dead? +// private boolean isValidTrTd(List ancestors) { +// String name; +// int offset = ancestors.size(); +// if (offset >= 2) { +// return IHTMLConstants.TAG_TR.equalsIgnoreCase(((Node) ancestors +// .get(offset - 1)).getLocalName()) +// && // +// (IHTMLConstants.TAG_TH.equalsIgnoreCase(((Node) ancestors +// .get(offset - 2)).getLocalName()) || // +// IHTMLConstants.TAG_TD.equalsIgnoreCase(((Node) ancestors +// .get(offset - 2)).getLocalName())); +// } +// return false; +// } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/IValidationRule.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/IValidationRule.java index 42a173ac5..296d02ba0 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/IValidationRule.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/IValidationRule.java @@ -15,5 +15,5 @@ package org.eclipse.jst.pagedesigner.validation.caret; * @author mengbo */ public interface IValidationRule { - + // TODO: tagging interface? } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/InlineEditingNavigationMediator.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/InlineEditingNavigationMediator.java index e076923b5..696dc30ab 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/InlineEditingNavigationMediator.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/InlineEditingNavigationMediator.java @@ -39,7 +39,6 @@ public class InlineEditingNavigationMediator extends */ public InlineEditingNavigationMediator(ActionData actionData) { super(actionData); - // TODO Auto-generated constructor stub } /* @@ -180,8 +179,7 @@ public class InlineEditingNavigationMediator extends part = Target.resolvePart(node); } return part; - } else { - return null; } + return null; } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/viewer/CaretPositionResolver.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/viewer/CaretPositionResolver.java index ca7a59c8f..d3f5ea386 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/viewer/CaretPositionResolver.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/viewer/CaretPositionResolver.java @@ -76,33 +76,32 @@ public class CaretPositionResolver { if (part1 == null || EditModelQuery.isTransparentText(Target.resolveNode(part1 .getPart()))) { - return (LayoutPart) part2; + return part2; } else if (part2 == null || EditModelQuery.isTransparentText(Target.resolveNode(part2 .getPart()))) { - return (LayoutPart) part1; + return part1; } - Rectangle rect1 = ((LayoutPart) part1).getAbsoluteBounds(); - Rectangle rect2 = ((LayoutPart) part2).getAbsoluteBounds(); - Node n1 = Target.resolveNode(((LayoutPart) part1).getPart()); - Node n2 = Target.resolveNode(((LayoutPart) part2).getPart()); + Rectangle rect1 = part1.getAbsoluteBounds(); + Rectangle rect2 = part2.getAbsoluteBounds(); + Node n1 = Target.resolveNode(part1.getPart()); + Node n2 = Target.resolveNode(part2.getPart()); // Within same. if (EditModelQuery.isChild(n1, n2) && (CaretPositionResolver.getXDistance(rect2, _point) == 0) && !part1.isCloseToEdgeFromOutSide()) { - return (LayoutPart) part2; + return part2; } else if (EditModelQuery.isChild(n2, n1) && (CaretPositionResolver.getXDistance(rect1, _point) == 0 && !part2 .isCloseToEdgeFromOutSide()) && !part2.isCloseToEdgeFromOutSide()) { - return (LayoutPart) part1; + return part1; } if (rect1.intersect(new Rectangle(rect1.x, rect2.y, rect1.width, rect2.height)).height == 0) { return heightFirst(part1, part2, _point); - } else { - return widthFirst(part1, part2, _point); } + return widthFirst(part1, part2, _point); } private static LayoutPart heightFirst(LayoutPart part1, LayoutPart part2, @@ -114,44 +113,42 @@ public class CaretPositionResolver { int offset2 = Math.abs(CaretPositionResolver .getYDistance(rect2, _point)); if (offset1 > offset2) { - return (LayoutPart) part2; + return part2; } else if (offset1 < offset2) { - return (LayoutPart) part1; + return part1; } else { offset1 = Math.abs(CaretPositionResolver .getXDistance(rect1, _point)); offset2 = Math.abs(CaretPositionResolver .getXDistance(rect2, _point)); if (offset1 >= offset2) { - return (LayoutPart) part2; - } else { - return (LayoutPart) part1; + return part2; } + return part1; } } private static LayoutPart widthFirst(LayoutPart part1, LayoutPart part2, Point _point) { - Rectangle rect1 = ((LayoutPart) part1).getAbsoluteBounds(); - Rectangle rect2 = ((LayoutPart) part2).getAbsoluteBounds(); + Rectangle rect1 = part1.getAbsoluteBounds(); + Rectangle rect2 = part2.getAbsoluteBounds(); int offset1 = Math.abs(CaretPositionResolver .getXDistance(rect1, _point)); int offset2 = Math.abs(CaretPositionResolver .getXDistance(rect2, _point)); if (offset1 > offset2) { - return (LayoutPart) part2; + return part2; } else if (offset1 < offset2) { - return (LayoutPart) part1; + return part1; } else { offset1 = Math.abs(CaretPositionResolver .getYDistance(rect1, _point)); offset2 = Math.abs(CaretPositionResolver .getYDistance(rect2, _point)); if (offset1 >= offset2) { - return (LayoutPart) part2; - } else { - return (LayoutPart) part1; + return part2; } + return part1; } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/viewer/CaretUpdater.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/viewer/CaretUpdater.java index 3fe1e6c25..95f6742da 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/viewer/CaretUpdater.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/viewer/CaretUpdater.java @@ -16,14 +16,11 @@ import java.beans.PropertyChangeListener; import org.eclipse.draw2d.FigureListener; import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.Polyline; import org.eclipse.draw2d.RangeModel; import org.eclipse.draw2d.Viewport; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gef.GraphicalEditPart; import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.jst.pagedesigner.PDPlugin; -import org.eclipse.jst.pagedesigner.common.logging.Logger; import org.eclipse.jst.pagedesigner.css2.property.ICSSPropertyID; import org.eclipse.jst.pagedesigner.tools.ExposeHelper; import org.eclipse.swt.widgets.Caret; @@ -42,7 +39,7 @@ import org.eclipse.swt.widgets.Caret; */ public class CaretUpdater implements IHTMLGraphicalViewerListener, FigureListener { - private static final Logger _log = PDPlugin.getLogger(CaretUpdater.class); +// private static final Logger _log = PDPlugin.getLogger(CaretUpdater.class); private IHTMLGraphicalViewer _viewer; @@ -56,7 +53,7 @@ public class CaretUpdater implements IHTMLGraphicalViewerListener, */ private IFigure _trackFigure; - private Polyline _rangeStartCaret; + //TODO: dead? private Polyline _rangeStartCaret; public CaretUpdater(IHTMLGraphicalViewer viewer) { _viewer = viewer; @@ -133,7 +130,7 @@ public class CaretUpdater implements IHTMLGraphicalViewerListener, private void updateRangeSelection() { // FIXME: optimization needed here. Normally should not repaint the // whole page. - DesignRange range = _viewer.getRangeSelection(); + // TODO: dead?? DesignRange range = _viewer.getRangeSelection(); ((GraphicalEditPart) _viewer.getRootEditPart()).getFigure().repaint(); ((GraphicalEditPart) _viewer.getRootEditPart()).getFigure() .getUpdateManager().performUpdate(); diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/viewer/DesignPosition.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/viewer/DesignPosition.java index f541b1390..5111dac4c 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/viewer/DesignPosition.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/viewer/DesignPosition.java @@ -27,7 +27,7 @@ public class DesignPosition { int _offset; - private Node _containerNode; + //private Node _containerNode; /** * @param part @@ -37,7 +37,7 @@ public class DesignPosition { _containerPart = part; _offset = offset; - int[] a = new int[] { 0, 0 }; + // TODO: ?? int[] a = new int[] { 0, 0 }; } /** @@ -52,9 +52,8 @@ public class DesignPosition { public Node getContainerNode() { if (_containerPart != null) { return (Node) _containerPart.getModel(); - } else { - return null; } + return null; } /** @@ -102,10 +101,9 @@ public class DesignPosition { if (parent == null) { return new DesignPosition(part, 0); - } else { - return new DesignPosition(parent, parent.getChildren() - .indexOf(part)); } + return new DesignPosition(parent, parent.getChildren() + .indexOf(part)); } /** @@ -119,10 +117,9 @@ public class DesignPosition { if (parent == null) { return new DesignPosition(part, part.getChildren().size()); - } else { - return new DesignPosition(parent, parent.getChildren() - .indexOf(part) + 1); } + return new DesignPosition(parent, parent.getChildren() + .indexOf(part) + 1); } /* @@ -147,7 +144,7 @@ public class DesignPosition { * @see java.lang.Object#toString() */ public StringBuffer debugDump(StringBuffer buffer) { - try { +// try { buffer.append("DesignPosition: ").append(this._containerPart) .append(": ").append(this._offset).append("\n"); @@ -167,8 +164,9 @@ public class DesignPosition { this._offset)).append("\n"); } } - } catch (Exception e) { - } + //TODO: what was being caught here? +// } catch (Exception e) { +// } return buffer; } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/viewer/EditPartPositionHelper.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/viewer/EditPartPositionHelper.java index 9d61fe892..2e7101b3d 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/viewer/EditPartPositionHelper.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/viewer/EditPartPositionHelper.java @@ -20,8 +20,6 @@ import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gef.EditPart; import org.eclipse.gef.GraphicalEditPart; import org.eclipse.jst.pagedesigner.IHTMLConstants; -import org.eclipse.jst.pagedesigner.PDPlugin; -import org.eclipse.jst.pagedesigner.common.logging.Logger; import org.eclipse.jst.pagedesigner.css2.layout.CSSFigure; import org.eclipse.jst.pagedesigner.css2.layout.CSSTextFigure; import org.eclipse.jst.pagedesigner.css2.layout.FlowBox; @@ -42,8 +40,8 @@ import org.w3c.dom.Node; * @author mengbo */ public class EditPartPositionHelper { - private final static Logger _log = PDPlugin - .getLogger(EditPartPositionHelper.class); +// private final static Logger _log = PDPlugin +// .getLogger(EditPartPositionHelper.class); /** * Add something to curent @@ -169,6 +167,7 @@ public class EditPartPositionHelper { * @param skip * @return */ + //TODO: needs refactoring public static DesignPosition innerFindEditPartPosition(EditPart rootHost, EditPart host, Point p, FlowBoxLine boxLine, IPositionMediator validator) { @@ -185,10 +184,9 @@ public class EditPartPositionHelper { } // found?!! return position; - } else { - addToCurrentLine(boxLine, host, p, validator); - return null; } + addToCurrentLine(boxLine, host, p, validator); + return null; } // widget else if (isWidget(host)) { @@ -200,16 +198,11 @@ public class EditPartPositionHelper { if (IHTMLConstants.TAG_BR.equalsIgnoreCase(Target.resolveNode( host).getNodeName())) { return new DesignRefPosition(host, lPart.isBeforePoint(p)); - } else { - return new DesignRefPosition(host, lPart.isBeforePoint(p) - || !lPart.atLeftPart(p)); } - // found!!! - // return new DesignRefPosition(host, lPart.isBeforePoint(p) || - // !lPart.atLeftPart(p)); - } else { - addToCurrentLine(boxLine, host, p, validator); + return new DesignRefPosition(host, lPart.isBeforePoint(p) + || !lPart.atLeftPart(p)); } + addToCurrentLine(boxLine, host, p, validator); } else { // root host. we always supporse it has editable area. if (host == rootHost) { @@ -245,9 +238,8 @@ public class EditPartPositionHelper { return new DesignRefPosition(host, lPart .isBeforePoint(p) || !lPart.atLeftPart(p)); - } else { - addToCurrentLine(boxLine, host, p, validator); } + addToCurrentLine(boxLine, host, p, validator); } // can edit else { @@ -273,9 +265,8 @@ public class EditPartPositionHelper { if (lPart.contains(p)) { // found!!! return new DesignPosition(host, 0); - } else { - addToCurrentLine(boxLine, host, p, validator); } + addToCurrentLine(boxLine, host, p, validator); } } // not contains p @@ -330,6 +321,7 @@ public class EditPartPositionHelper { * @param skip * @return */ + // TODO: needs refactoring public static DesignPosition innerFindEditPartPositionConstrained( EditPart rootHost, EditPart host, Point p, FlowBoxLine boxLine, IMovementMediator validator) { @@ -346,10 +338,9 @@ public class EditPartPositionHelper { } // found?!! return position; - } else { - addToCurrentLine(boxLine, host, p, validator); - return null; } + addToCurrentLine(boxLine, host, p, validator); + return null; } // widget else if (isWidget(host)) { @@ -358,13 +349,11 @@ public class EditPartPositionHelper { if (IHTMLConstants.TAG_BR.equalsIgnoreCase(Target.resolveNode( host).getNodeName())) { return new DesignRefPosition(host, lPart.isBeforePoint(p)); - } else { - return new DesignRefPosition(host, lPart.isBeforePoint(p) - || !lPart.atLeftPart(p)); } - } else { - addToCurrentLine(boxLine, host, p, validator); + return new DesignRefPosition(host, lPart.isBeforePoint(p) + || !lPart.atLeftPart(p)); } + addToCurrentLine(boxLine, host, p, validator); } else { // root host. we always supporse it has editable area. if (host == rootHost) { @@ -398,9 +387,8 @@ public class EditPartPositionHelper { return new DesignRefPosition(host, lPart .isBeforePoint(p) || !lPart.atLeftPart(p)); - } else { - addToCurrentLine(boxLine, host, p, validator); } + addToCurrentLine(boxLine, host, p, validator); } } // can edit @@ -423,9 +411,8 @@ public class EditPartPositionHelper { if (lPart.contains(p)) { // found!!! return new DesignPosition(host, 0); - } else { - addToCurrentLine(boxLine, host, p, validator); } + addToCurrentLine(boxLine, host, p, validator); } } // not contains p @@ -485,13 +472,11 @@ public class EditPartPositionHelper { int offset = figure.getInsertionOffset(p); if (offset >= 0) { return new DesignPosition(host, offset); - } else { - return null; } - } else { - // should not happen. - return new DesignPosition(host, 0); + return null; } + // should not happen. + return new DesignPosition(host, 0); } /** @@ -516,9 +501,8 @@ public class EditPartPositionHelper { .getBounds().getCopy(); ((GraphicalEditPart) child).getFigure().translateToAbsolute(bounds); return bounds; - } else { - return new Rectangle(0, 0, 0, 0); } + return new Rectangle(0, 0, 0, 0); } /** @@ -529,9 +513,8 @@ public class EditPartPositionHelper { private static boolean isWidget(EditPart host) { if (host instanceof NodeEditPart) { return ((NodeEditPart) host).isWidget(); - } else { - return false; } + return false; } /** @@ -690,10 +673,10 @@ public class EditPartPositionHelper { domposition = BodyHelper .adjustInsertPosition(uri, tag, domposition); } + // TODO: huh? if (domposition != null) { return DOMPositionHelper.toDesignPosition(domposition); - } else { - return null; } + return null; } } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/viewer/FlowBoxLine.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/viewer/FlowBoxLine.java index d6f9d1ad2..909143cf9 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/viewer/FlowBoxLine.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/viewer/FlowBoxLine.java @@ -111,12 +111,10 @@ public class FlowBoxLine { if (closer(lPart)) { resetBounds(lPart); return true; - } else { - return false; } - } else { - rect = lPart.getAbsoluteBounds(); + return false; } + rect = lPart.getAbsoluteBounds(); int xx = Math.min(rect.x, _x); int width = Math.max(rect.getRight().x, getRightBottom().x) - xx; int yy = Math.min(rect.y, _y); @@ -173,9 +171,8 @@ public class FlowBoxLine { } if (result != null) { return result.getPart(); - } else { - return null; } + return null; } /** diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/viewer/HTMLGraphicalViewer.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/viewer/HTMLGraphicalViewer.java index 06007a03c..a9d00cf9b 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/viewer/HTMLGraphicalViewer.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/viewer/HTMLGraphicalViewer.java @@ -89,9 +89,8 @@ public class HTMLGraphicalViewer extends ScrollingGraphicalViewer implements FigureCanvas canvas = this.getFigureCanvas(); if (canvas != null) { return canvas.getViewport(); - } else { - return null; } + return null; } public IDOMModel getModel() { @@ -99,18 +98,16 @@ public class HTMLGraphicalViewer extends ScrollingGraphicalViewer implements EditPart part = this.getContents(); if (part != null) { return ((IDOMNode) part.getModel()).getModel(); - } else { - return null; } + return null; } public IStatusLineManager getStatusLineManager() { if (_parentPart == null) { return null; - } else { - return _parentPart.getEditorSite().getActionBars() - .getStatusLineManager(); } + return _parentPart.getEditorSite().getActionBars() + .getStatusLineManager(); } public Caret getCaret() { @@ -189,9 +186,8 @@ public class HTMLGraphicalViewer extends ScrollingGraphicalViewer implements public ISelection getSelection() { if (isInRangeMode()) { return getRangeSelection(); - } else { - return super.getSelection(); } + return super.getSelection(); } /* diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/viewer/LayoutPart.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/viewer/LayoutPart.java index fe9d23a3c..0f391ccb5 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/viewer/LayoutPart.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/viewer/LayoutPart.java @@ -146,33 +146,32 @@ public class LayoutPart { if (boxRect.contains(_point.x, _point.y)) { closestBox = box; break; - } else { - if (closestBox == null) { - closestBox = box; - } else { - // compare y. - int offset1 = Math.abs(CaretPositionResolver.getYDistance( - boxRect, _point)); - Rectangle closestRect = getAbsoluteBounds(closestBox); - int offset2 = Math.abs(CaretPositionResolver.getYDistance( - closestRect, _point)); - if (offset1 < offset2) { - closestBox = box; - } - } - // at the same line - if (closestBox != box && boxRect.contains(boxRect.x, _point.y)) { - // compare x. - int offset1 = Math.abs(CaretPositionResolver.getXDistance( - boxRect, _point)); - Rectangle closestRect = getAbsoluteBounds(closestBox); - int offset2 = Math.abs(CaretPositionResolver.getXDistance( - closestRect, _point)); - if (offset1 < offset2) { - closestBox = box; - } - } } + if (closestBox == null) { + closestBox = box; + } else { + // compare y. + int offset1 = Math.abs(CaretPositionResolver.getYDistance( + boxRect, _point)); + Rectangle closestRect = getAbsoluteBounds(closestBox); + int offset2 = Math.abs(CaretPositionResolver.getYDistance( + closestRect, _point)); + if (offset1 < offset2) { + closestBox = box; + } + } + // at the same line + if (closestBox != box && boxRect.contains(boxRect.x, _point.y)) { + // compare x. + int offset1 = Math.abs(CaretPositionResolver.getXDistance( + boxRect, _point)); + Rectangle closestRect = getAbsoluteBounds(closestBox); + int offset2 = Math.abs(CaretPositionResolver.getXDistance( + closestRect, _point)); + if (offset1 < offset2) { + closestBox = box; + } + } } return closestBox; } @@ -217,7 +216,7 @@ public class LayoutPart { atPointLeft = isBeforePoint(_point); atPointRight = isAfterPoint(_point); if (!(atPointLeft ^ atPointRight)) { - + // TODO: and...? } Target target = new Target(getPart()); if (validator.isValidPosition(new DOMRefPosition(target.getNode(), @@ -238,9 +237,10 @@ public class LayoutPart { return result; } - private IFigure getFigure() { - return ((GraphicalEditPart) _part).getFigure(); - } + // TODO: dead? +// private IFigure getFigure() { +// return ((GraphicalEditPart) _part).getFigure(); +// } public boolean isAfterPoint(Point point) { boolean result = false; @@ -362,13 +362,13 @@ public class LayoutPart { } /** - * @param _part + * @param part * @return */ - List getLines(EditPart _part) { + List getLines(EditPart part) { List fragments = new ArrayList(); - if (_part instanceof SubNodeEditPart) { - IFigure figure = ((GraphicalEditPart) _part).getFigure(); + if (part instanceof SubNodeEditPart) { + IFigure figure = ((GraphicalEditPart) part).getFigure(); if (figure instanceof CSSTextFigure) { fragments = ((CSSTextFigure) figure).getFragments(); @@ -453,9 +453,10 @@ public class LayoutPart { return EditModelQuery.isInline(Target.resolveNode(_part)); } - private boolean isWidget() { - return EditModelQuery.isWidget(_part); - } + // TODO: dead? +// private boolean isWidget() { +// return EditModelQuery.isWidget(_part); +// } /* * (non-Javadoc) |