[jbosstools-commits] JBoss Tools SVN: r15552 - in trunk/jst/plugins: org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/css and 1 other directory.
Author: sdzmitrovich
Date: 2009-05-27 06:23:40 -0400 (Wed, 27 May 2009)
New Revision: 15552
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.web.ui/src/org/jboss/tools/jst/web/ui/wizards/css/NewCSSClassWizard.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4370
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-27
09:40:38 UTC (rev 15551)
+++
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/AbstractCSSDialog.java 2009-05-27
10:23:40 UTC (rev 15552)
@@ -186,7 +186,7 @@
} else {
setPreviewContent(text);
}
-
+
browser.setText(generateBrowserPage());
previewText.setVisible(false);
browser.setVisible(true);
@@ -209,11 +209,11 @@
}
protected void handleStatusChanged(IStatus newStatus) {
- if (newStatus.isOK() && !status.isOK())
+ if (newStatus.isOK() && !status.isOK()) {
setErrorMessage(null);
- else if (newStatus.getSeverity() == IStatus.ERROR)
+ } else if (newStatus.getSeverity() == IStatus.ERROR) {
setErrorMessage(newStatus.getMessage());
-
+ }
if (newStatus.getSeverity() != status.getSeverity()) {
getButton(OK).setEnabled(newStatus.isOK());
}
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-27
09:40:38 UTC (rev 15551)
+++
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSClassDialog.java 2009-05-27
10:23:40 UTC (rev 15552)
@@ -307,6 +307,7 @@
cssModel.setFile(file);
cssModel.reinit();
preview.reinit(cssModel);
+ getStyleComposite().clearStyleComposite();
updateControlPane();
}
@@ -360,4 +361,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.web.ui/src/org/jboss/tools/jst/web/ui/wizards/css/NewCSSClassWizard.java
===================================================================
---
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/css/NewCSSClassWizard.java 2009-05-27
09:40:38 UTC (rev 15551)
+++
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/css/NewCSSClassWizard.java 2009-05-27
10:23:40 UTC (rev 15552)
@@ -189,6 +189,7 @@
selection) {
protected void handleStatusChanged(
IStatus newStatus) {
+
if (newStatus.isOK()
&& !getStatus().isOK()) {
NewCSSClassWizardPage.this
@@ -201,6 +202,26 @@
canFinish = false;
}
+ if (newStatus.getSeverity() != getStatus()
+ .getSeverity()) {
+ if (!getApplyButton().isDisposed()) {
+ getApplyButton().setEnabled(
+ newStatus.isOK());
+ }
+ if (!getClassCombo().isDisposed()) {
+ getClassCombo().setEnabled(
+ newStatus.isOK());
+ }
+ if (!getAddNewClassButton()
+ .isDisposed()) {
+ getAddNewClassButton()
+ .setEnabled(newStatus
+ .isOK());
+ }
+ }
+ if (getContainer() != null) {
+ getContainer().updateButtons();
+ }
setStatus(newStatus);
};
};
@@ -220,7 +241,6 @@
setControl(container);
}
-
}
}