Author: sdzmitrovich
Date: 2009-05-30 08:01:27 -0400 (Sat, 30 May 2009)
New Revision: 15614
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/AbstractCSSDialog.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSClassDialog.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSStyleDialog.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4396
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/AbstractCSSDialog.java
===================================================================
---
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/AbstractCSSDialog.java 2009-05-30
01:35:08 UTC (rev 15613)
+++
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/AbstractCSSDialog.java 2009-05-30
12:01:27 UTC (rev 15614)
@@ -86,8 +86,6 @@
gridData.heightHint = DEFAULT_DIALOG_HEIGHT;
gridData.widthHint = DEFAULT_DIALOG_WIDTH;
- setTitle(JstUIMessages.CSS_STYLE_CLASS_EDITOR_TITLE);
-
createControlPane(parentComposite);
return parentComposite;
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSClassDialog.java
===================================================================
---
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSClassDialog.java 2009-05-30
01:35:08 UTC (rev 15613)
+++
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSClassDialog.java 2009-05-30
12:01:27 UTC (rev 15614)
@@ -77,16 +77,23 @@
public CSSClassDialog(Shell parentShell, IFile file,
IStructuredSelection selection) {
super(parentShell);
-
setShellStyle(getShellStyle() | SWT.RESIZE | SWT.MAX
| SWT.APPLICATION_MODAL);
this.file = file;
this.cssModel = new CSSModel(file);
this.selection = selection;
+
}
@Override
+ protected void configureShell(Shell newShell) {
+ super.configureShell(newShell);
+ newShell.setText(JstUIMessages.CSS_STYLE_CLASS_EDITOR_TITLE);
+
+ }
+
+ @Override
protected Control createContents(Composite parent) {
Control contents = super.createContents(parent);
updateControlPane();
@@ -94,6 +101,12 @@
}
@Override
+ protected Control createDialogArea(Composite parent) {
+ setTitle(JstUIMessages.CSS_STYLE_CLASS_EDITOR_TITLE);
+ return super.createDialogArea(parent);
+ }
+
+ @Override
protected StyleComposite createStyleComposite(Composite parent) {
StyleComposite styleComposite = super.createStyleComposite(parent);
@@ -257,13 +270,12 @@
classCombo.select(classCombo.getItemCount() - 1);
}
-
@Override
public void releaseResources() {
-
+
super.releaseResources();
preview.releaseModel();
-
+
if (cssModel != null) {
cssModel.release();
cssModel = null;
@@ -364,17 +376,17 @@
applyButton.setEnabled(false);
}
-
+
protected Button getApplyButton() {
return applyButton;
}
-
+
protected Button getAddNewClassButton() {
return addNewClassButton;
}
-
+
protected Combo getClassCombo() {
return classCombo;
}
-
+
}
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSStyleDialog.java
===================================================================
---
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSStyleDialog.java 2009-05-30
01:35:08 UTC (rev 15613)
+++
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSStyleDialog.java 2009-05-30
12:01:27 UTC (rev 15614)
@@ -14,7 +14,10 @@
import java.util.Map;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Shell;
+import org.jboss.tools.jst.jsp.messages.JstUIMessages;
import org.jboss.tools.jst.jsp.outline.cssdialog.common.CSSConstants;
import org.jboss.tools.jst.jsp.outline.cssdialog.common.Constants;
import org.jboss.tools.jst.jsp.outline.cssdialog.common.Util;
@@ -61,4 +64,16 @@
}
return properties;
}
+
+ @Override
+ protected void configureShell(Shell newShell) {
+ super.configureShell(newShell);
+ newShell.setText(JstUIMessages.CSS_STYLE_EDITOR_TITLE);
+ }
+
+ @Override
+ protected Control createDialogArea(Composite parent) {
+ setTitle(JstUIMessages.CSS_STYLE_EDITOR_TITLE);
+ return super.createDialogArea(parent);
+ }
}