Author: mareshkau Date: 2009-06-24 07:46:14 -0400 (Wed, 24 Jun 2009) New Revision: 16184 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/bundle/BundleMap.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/BaseActionManager.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/InsertContributionItem.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/VpeMenuCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/VpeEditorPreferencesPage.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/selection/VpeSourceSelection.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCustomTemplate.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeEditAnyDialog.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeLinkCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xpl/CustomSashForm.java Log: Fixing PMD code violations Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2009-06-24 11:21:33 UTC (rev 16183) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2009-06-24 11:46:14 UTC (rev 16184) @@ -1477,7 +1477,7 @@ } - private class PseudoInfo { + private static class PseudoInfo { private nsIDOMNode pseudoNode; private boolean isElements; Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/bundle/BundleMap.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/bundle/BundleMap.java 2009-06-24 11:21:33 UTC (rev 16183) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/bundle/BundleMap.java 2009-06-24 11:46:14 UTC (rev 16184) @@ -53,12 +53,8 @@ import org.jboss.tools.vpe.VpePlugin; public class BundleMap { -// private static final String BEGIN_BUNDLE = "#{"; -// private static final String END_BUNDLE = "}"; -// private static final String BEGIN_ARRAY_STYLE_PROPERTY_NAME_SEPARATOR = "['"; -// private static final String END_ARRAY_STYLE_PROPERTY_NAME_SEPARATOR = "']"; - public static final String TITLE_ATTRIBUTE_NAME = "title"; + public static final String TITLE_ATTRIBUTE_NAME = "title"; //$NON-NLS-1$ private BundleMapListener[] bundleMapListeners = new BundleMapListener[0]; private StructuredTextEditor editor; @@ -452,12 +448,12 @@ } } - class Expression{ +static class Expression{ public String prefix; public String propertyName; } - class BundleEntry{ +static class BundleEntry{ public ResourceBundle bundle; public String uri; public String prefix; @@ -471,7 +467,7 @@ } } - class UsedKey{ +static class UsedKey{ public int hashCode; public String uri; public String prefix; Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/BaseActionManager.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/BaseActionManager.java 2009-06-24 11:21:33 UTC (rev 16183) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/BaseActionManager.java 2009-06-24 11:46:14 UTC (rev 16184) @@ -552,7 +552,7 @@ noContainerTags.add("wbr"); } - public class ActionHelper extends ModelQueryActionHelper { + public static class ActionHelper extends ModelQueryActionHelper { public ActionHelper(ModelQueryImpl query) { super(query); } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/InsertContributionItem.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/InsertContributionItem.java 2009-06-24 11:21:33 UTC (rev 16183) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/InsertContributionItem.java 2009-06-24 11:46:14 UTC (rev 16184) @@ -217,7 +217,7 @@ * * @author Sergey Dzmitrovich */ - public class InsertSubMenuManager extends MenuManager { + public static class InsertSubMenuManager extends MenuManager { public InsertSubMenuManager(String text) { super(text); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/VpeMenuCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/VpeMenuCreator.java 2009-06-24 11:21:33 UTC (rev 16183) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/VpeMenuCreator.java 2009-06-24 11:46:14 UTC (rev 16184) @@ -184,7 +184,7 @@ /** * Test action. For the debugging purposes only. */ - public class TestAction extends Action { + public static class TestAction extends Action { public TestAction() { setText("Test Action"); //$NON-NLS-1$ } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/VpeEditorPreferencesPage.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/VpeEditorPreferencesPage.java 2009-06-24 11:21:33 UTC (rev 16183) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/VpeEditorPreferencesPage.java 2009-06-24 11:46:14 UTC (rev 16184) @@ -41,7 +41,7 @@ prefsdlg.open(); } - class GeneralPage extends XMOBasedPreferencesPage { + static class GeneralPage extends XMOBasedPreferencesPage { public GeneralPage() { super(ModelUtilities.getPreferenceModel().getByPath(VpePreference.VPE_EDITOR_PATH)); } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/selection/VpeSourceSelection.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/selection/VpeSourceSelection.java 2009-06-24 11:21:33 UTC (rev 16183) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/selection/VpeSourceSelection.java 2009-06-24 11:46:14 UTC (rev 16184) @@ -100,7 +100,7 @@ return startNode == endNode; } - public class VpeNodeIterator { + public static class VpeNodeIterator { private Node nextNode; private Node endNode; Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCustomTemplate.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCustomTemplate.java 2009-06-24 11:21:33 UTC (rev 16183) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCustomTemplate.java 2009-06-24 11:46:14 UTC (rev 16184) @@ -168,7 +168,7 @@ * @author mareshkau * */ - private class TransferObject { + private static class TransferObject { private ResourceReference [] resourceReferebces; private IFile customFile; Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableCreator.java 2009-06-24 11:21:33 UTC (rev 16183) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableCreator.java 2009-06-24 11:46:14 UTC (rev 16184) @@ -596,7 +596,7 @@ String[] rowClasses = getClasses(value); String rowClass = (rowClasses != null && rowClasses.length > 0) ? rowClasses[0] : null; - if (rowClass.trim().length() > 0) { + if (rowClass!=null && rowClass.trim().length() > 0) { row.setAttribute(HTML.ATTR_CLASS, rowClass); } else { row.removeAttribute(HTML.ATTR_CLASS); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeEditAnyDialog.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeEditAnyDialog.java 2009-06-24 11:21:33 UTC (rev 16183) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeEditAnyDialog.java 2009-06-24 11:46:14 UTC (rev 16184) @@ -219,7 +219,7 @@ } } - private class CheckControl { + private static class CheckControl { private Label label; private Button button; Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeLinkCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeLinkCreator.java 2009-06-24 11:21:33 UTC (rev 16183) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeLinkCreator.java 2009-06-24 11:46:14 UTC (rev 16184) @@ -11,8 +11,6 @@ package org.jboss.tools.vpe.editor.template; import java.util.Map; -import java.util.Set; - import org.jboss.tools.vpe.VpePlugin; import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.template.expression.VpeExpression; @@ -32,7 +30,6 @@ private VpeExpression hrefExpr; private String hrefStr; - private String relStr; VpeLinkCreator(Element taglibElement, VpeDependencyMap dependencyMap, boolean caseSensitive) { @@ -52,16 +49,6 @@ VpePlugin.reportProblem(e); } } - - Attr relAttr = element.getAttributeNode(VpeTemplateManager.ATTR_LINK_REL); - if (relAttr != null) { - try { - relStr = relAttr.getValue(); - VpeExpressionInfo info = VpeExpressionBuilder.buildCompletedExpression(relStr, caseSensitive); - } catch(VpeExpressionBuilderException e) { - VpePlugin.reportProblem(e); - } - } } @Override public VpeCreatorInfo create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, nsIDOMElement visualElement, Map visualNodeMap) { Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xpl/CustomSashForm.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xpl/CustomSashForm.java 2009-06-24 11:21:33 UTC (rev 16183) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xpl/CustomSashForm.java 2009-06-24 11:46:14 UTC (rev 16184) @@ -165,7 +165,7 @@ if (noMaxUp & noMaxDown) return; // If you can't max up or down, there there is no need for arrows. - SASH_WIDTH = 3+ getOrientation() == SWT.VERTICAL ? ARROW_HEIGHT : ARROW_SIZE; + SASH_WIDTH = ARROW_SIZE; arrowColor = new Color(parent.getDisplay(), 99, 101, 156); //arrowColor = new Color(parent.getDisplay(), 0, 0, 0);