Author: dgolovin Date: 2011-09-21 20:43:21 -0400 (Wed, 21 Sep 2011) New Revision: 34945 Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/properties/CSSPropertyPage.java trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/properties/QuickEditSection.java trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/view/CSSEditorView.java trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/view/CSSPreview.java trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/wizard/NewCSSClassWizard.java trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/wizard/WizardNewCssClassPage.java Log: code cleanup after review changes in https://source.jboss.org/changelog/JBossTools?cs=34926 Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/properties/CSSPropertyPage.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/properties/CSSPropertyPage.java 2011-09-22 00:41:24 UTC (rev 34944) +++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/properties/CSSPropertyPage.java 2011-09-22 00:43:21 UTC (rev 34945) @@ -106,32 +106,25 @@ super.selectionChanged(part, selection); } } - } public void update() { - if (selectedObject instanceof StyleContainer) { getStyleAttributes().removeChangeListener(this); getStyleAttributes().setStyleProperties( ((StyleContainer) selectedObject).getStyleAttributes()); getStyleAttributes().addChangeListener(this); } - } public void handleChange(ChangeEvent event) { - if (selectedObject instanceof StyleContainer) { - ((StyleContainer) selectedObject) .applyStyleAttributes(getStyleAttributes() .getStyleProperties()); } - } - /** * * @return @@ -145,7 +138,6 @@ } public ISelection getCurrentSelection() { - Object currentSelectedObject = selectedObject; if (selectedObject instanceof StyleContainer) currentSelectedObject = ((StyleContainer) selectedObject) Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/properties/QuickEditSection.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/properties/QuickEditSection.java 2011-09-22 00:41:24 UTC (rev 34944) +++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/properties/QuickEditSection.java 2011-09-22 00:43:21 UTC (rev 34945) @@ -39,9 +39,4 @@ getTabComposite().layout(true, true); super.setInput(part, selection); } - - @Override - public void aboutToBeShown() { - super.aboutToBeShown(); - } } Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/view/CSSEditorView.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/view/CSSEditorView.java 2011-09-22 00:41:24 UTC (rev 34944) +++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/view/CSSEditorView.java 2011-09-22 00:43:21 UTC (rev 34945) @@ -38,7 +38,6 @@ @Override public void init(IViewSite site) throws PartInitException { - super.init(site); getSite().getPage().removeSelectionListener(this); CSSStyleListener.getInstance().addSelectionListener(this); @@ -46,7 +45,6 @@ @Override public void dispose() { - super.dispose(); CSSStyleListener.getInstance().removeSelectionListener(this); @@ -58,41 +56,23 @@ @Override protected PageRec doCreatePage(final IWorkbenchPart part) { - IPage page = createCssPropertyPage(); - - if (page != null) { - return new PageRec(part, page); - } - - return null; + return new PageRec(part, createCssPropertyPage()); } private IPage createCssPropertyPage() { - IPropertySheetPage page = new CSSPropertyPage( new ITabbedPropertySheetPageContributor() { - public String getContributorId() { return CONTRIBUTOR_ID; } }, this); - if (page != null) { - if (page instanceof IPageBookViewPage) { - initPage((IPageBookViewPage) page); - } - page.createControl(getPageBook()); - } + initPage((IPageBookViewPage) page); + page.createControl(getPageBook()); return page; - } @Override - public SelectionProvider getSelectionProvider() { - return super.getSelectionProvider(); - } - - @Override public Object getAdapter(Class key) { if (key == IContributedContentsView.class) { return new IContributedContentsView() { @@ -112,8 +92,6 @@ @Override protected boolean isImportant(IWorkbenchPart part) { - if ((part instanceof IEditorPart) || (part instanceof ContentOutline)) - return true; - return false; + return part instanceof IEditorPart || part instanceof ContentOutline; } } Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/view/CSSPreview.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/view/CSSPreview.java 2011-09-22 00:41:24 UTC (rev 34944) +++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/view/CSSPreview.java 2011-09-22 00:43:21 UTC (rev 34945) @@ -57,13 +57,11 @@ @Override public void init(IViewSite site) throws PartInitException { super.init(site); - CSSStyleListener.getInstance().addSelectionListener(this); } @Override public void dispose() { - CSSStyleListener.getInstance().removeSelectionListener(this); super.dispose(); } @@ -79,8 +77,7 @@ public void createPartControl(Composite parent) { final SashForm previewComposite = new SashForm(parent, SWT.None); previewComposite.setLayout(new GridLayout()); - GridData gridData = new GridData(GridData.FILL, GridData.FILL, true, - true); + GridData gridData = new GridData(GridData.FILL, GridData.FILL, true, true); previewComposite.setLayoutData(gridData); browser = CSSBrowser.createCSSBrowser(previewComposite, SWT.BORDER | SWT.MOZILLA); @@ -105,21 +102,18 @@ if (e.widget == previewText) { String text = previewText.getText(); if (!getPreviewContent().equals(text)) { - if (text == null || text.equals(Constants.EMPTY)) { + if (text.equals(Constants.EMPTY)) { setPreviewContent(CSSUIMessages.CSSPreview_DefaultBrowserText); } else { setPreviewContent(text); } updateBrowser(); } - browser.setEnabled(true); - previewComposite.setMaximizedControl(browser); } } }); - previewComposite.setMaximizedControl(browser); } @@ -139,10 +133,8 @@ * @return String html text representation */ public String generateBrowserPage() { - String html = Constants.OPEN_DIV_TAG + getCurrentStyle() + return Constants.OPEN_DIV_TAG + getCurrentStyle() + "\">" + getPreviewContent() + Constants.CLOSE_DIV_TAG; //$NON-NLS-1$ - - return html; } public String getPreviewContent() { @@ -154,23 +146,18 @@ } public void selectionChanged(IWorkbenchPart part, ISelection selection) { - if (selection instanceof IStructuredSelection) { Map<String, String> newAttributes; IStructuredSelection structuredSelection = (IStructuredSelection) selection; if (structuredSelection.getFirstElement() instanceof StyleContainer) { - newAttributes = ((StyleContainer) structuredSelection .getFirstElement()).getStyleAttributes(); - } else { - newAttributes = Collections.EMPTY_MAP; + newAttributes = Collections.emptyMap(); } updateView(newAttributes); - } - } public void updateBrowser() { @@ -178,15 +165,11 @@ } protected String getStyle(Map<String, String> styleAttributes) { - - StringBuffer style = new StringBuffer(); - + StringBuilder style = new StringBuilder(); for (Map.Entry<String, String> styleItem : styleAttributes.entrySet()) { - style.append(styleItem.getKey() + Constants.COLON + styleItem.getValue() + Constants.SEMICOLON); } - return style.toString(); } @@ -196,14 +179,11 @@ public void styleChanged(StyleContainer styleContainer) { updateView(styleContainer.getStyleAttributes()); - } protected void updateView(Map<String, String> attributes) { - this.styleAttributes = attributes; this.currentStyle = getStyle(attributes); updateBrowser(); - } } Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/wizard/NewCSSClassWizard.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/wizard/NewCSSClassWizard.java 2011-09-22 00:41:24 UTC (rev 34944) +++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/wizard/NewCSSClassWizard.java 2011-09-22 00:43:21 UTC (rev 34945) @@ -41,7 +41,6 @@ protected IStructuredSelection selection; // the workbench instance protected IWorkbench workbench; - // wizard contains only one page private NewCSSClassWizardPage editFilePage; @@ -51,7 +50,6 @@ * Constructor for SampleNewWizard. */ public NewCSSClassWizard() { - super(); setWindowTitle(CSSUIMessages.WIZARD_WINDOW_TITLE); } @@ -65,8 +63,7 @@ IResource selectedResource = (IResource) selection.getFirstElement(); if (selectedResource != null) { if (selectedResource.getType() == IFile.FILE - && !WizardNewCssClassPage.CSS_FILE_EXTENSION - .equals(selectedResource.getFileExtension())) { + && !WizardNewCssClassPage.CSS_FILE_EXTENSION.equals(selectedResource.getFileExtension())) { selectedResource = selectedResource.getParent(); } classDescription.setCssFile(selectedResource); @@ -79,7 +76,6 @@ */ @Override public void addPages() { - selectFilePage = new WizardNewCssClassPage(classDescription); editFilePage = new NewCSSClassWizardPage(); addPage(selectFilePage); @@ -104,8 +100,7 @@ */ @Override public boolean canFinish() { - return selectFilePage.canFlipToNextPage() - && getContainer().getCurrentPage() == editFilePage + return selectFilePage.canFlipToNextPage() && getContainer().getCurrentPage() == editFilePage && editFilePage.canFinish; } @@ -159,24 +154,20 @@ super("newCSSClassWizard"); //$NON-NLS-1$ setTitle(CSSUIMessages.WIZARD_TITLE); setDescription(CSSUIMessages.WIZARD_DESCRIPTION); - } /** * @see IDialogPage#createControl(Composite) */ public void createControl(final Composite parent) { - final Composite container = new Composite(parent, SWT.NONE); container.setLayout(new GridLayout(1, true)); - GridData gridData = new GridData(GridData.FILL, GridData.FILL, - true, true); + GridData gridData = new GridData(GridData.FILL, GridData.FILL, true, true); container.setLayoutData(gridData); if (getWizard().getContainer() instanceof WizardDialog) { - final WizardDialog wd = (WizardDialog) getWizard() - .getContainer(); + final WizardDialog wd = (WizardDialog) getWizard().getContainer(); wd.addPageChangedListener(new IPageChangedListener() { // set console configuration as treeViewer input @@ -184,39 +175,27 @@ if (event.getSelectedPage() == editFilePage) { if (dialog == null) { - dialog = new CSSClassDialog(getShell(), - (IFile) classDescription.getCssFile(), + dialog = new CSSClassDialog(getShell(), (IFile) classDescription.getCssFile(), selection) { - protected void handleStatusChanged( - IStatus newStatus) { + protected void handleStatusChanged(IStatus newStatus) { - if (newStatus.isOK() - && !getStatus().isOK()) { - NewCSSClassWizardPage.this - .setErrorMessage(null); + if (newStatus.isOK() && !getStatus().isOK()) { + NewCSSClassWizardPage.this.setErrorMessage(null); canFinish = true; } else if (newStatus.getSeverity() == IStatus.ERROR) { - NewCSSClassWizardPage.this - .setErrorMessage(newStatus - .getMessage()); + NewCSSClassWizardPage.this.setErrorMessage(newStatus.getMessage()); canFinish = false; } - if (newStatus.getSeverity() != getStatus() - .getSeverity()) { + if (newStatus.getSeverity() != getStatus().getSeverity()) { if (!getApplyButton().isDisposed()) { - getApplyButton().setEnabled( - newStatus.isOK()); + getApplyButton().setEnabled(newStatus.isOK()); } if (!getClassCombo().isDisposed()) { - getClassCombo().setEnabled( - newStatus.isOK()); + getClassCombo().setEnabled(newStatus.isOK()); } - if (!getAddNewClassButton() - .isDisposed()) { - getAddNewClassButton() - .setEnabled(newStatus - .isOK()); + if (!getAddNewClassButton().isDisposed()) { + getAddNewClassButton().setEnabled(newStatus.isOK()); } } if (getContainer() != null) { @@ -228,8 +207,7 @@ dialog.createControlPane(container); container.layout(); } else { - dialog.setFile((IFile) classDescription - .getCssFile()); + dialog.setFile((IFile) classDescription.getCssFile()); } dialog.reinit(); dialog.addNewClass(classDescription.cssClassName); @@ -239,7 +217,6 @@ } setControl(container); - } } Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/wizard/WizardNewCssClassPage.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/wizard/WizardNewCssClassPage.java 2011-09-22 00:41:24 UTC (rev 34944) +++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/wizard/WizardNewCssClassPage.java 2011-09-22 00:43:21 UTC (rev 34945) @@ -151,11 +151,8 @@ @Override public boolean canFlipToNextPage() { - if ((classNameText.getText().length() != 0) - && (getCssFile(selectFileText.getText()) != null)) { - return true; - } - return false; + return classNameText.getText().length() != 0 + && getCssFile(selectFileText.getText()) != null; } public void modifyText(ModifyEvent e) { @@ -166,8 +163,7 @@ if (getCssFile(selectFileText.getText()) == null) { setErrorMessage(CSSUIMessages.WIZARD_ERROR_FILE_SELECTION); - } else if ((classNameText.getText() == null) - || (classNameText.getText().length() == 0)) { + } else if (classNameText.getText().isEmpty()) { setErrorMessage(CSSUIMessages.WIZARD_ERROR_EMPTY_CLASSNAME); } else if (!CSSSelectorValidator.getInstance().isValidSelector( classNameText.getText())) {