Author: izhukov
Date: 2008-11-26 05:59:13 -0500 (Wed, 26 Nov 2008)
New Revision: 12067
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/messages/messages.properties
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/StyleComposite.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/Util.java
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/css/NewCSSClassWizard.java
Log:
JBIDE-3164, JBIDE-3150, JBIDE-2648, JBIDE-2648
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/messages/messages.properties
===================================================================
---
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/messages/messages.properties 2008-11-26
09:50:06 UTC (rev 12066)
+++
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/messages/messages.properties 2008-11-26
10:59:13 UTC (rev 12067)
@@ -43,7 +43,7 @@
BACKGROUND_TAB_NAME=Background
BOXES_TAB_NAME=Boxes
PROPERTY_SHEET_TAB_NAME=Property Sheet
-QUICK_EDIT_TAB_NAME=Quick Edit
+QUICK_EDIT_TAB_NAME=Edited properties
PREVIEW_SHEET_TAB_NAME=Preview
TEXT_DECORATION=Text Decoration:
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 2008-11-26
09:50:06 UTC (rev 12066)
+++
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSClassDialog.java 2008-11-26
10:59:13 UTC (rev 12067)
@@ -78,8 +78,7 @@
public static final String ID =
"org.jboss.tools.jst.jsp.outline.cssdialog.CSSClassDialog"; //$NON-NLS-1$
private static String notUsed = "not_used"; //$NON-NLS-1$
- private static final String CSS_FILE_EXTENTION = "css"; //$NON-NLS-1$
- private final static String[] fileExtensions = { CSS_FILE_EXTENTION };
+ private final static String[] fileExtensions = { Util.CSS_FILE_EXTENTION };
private final static String SKIP_FIRST_CHAR = "."; //$NON-NLS-1$
private Composite browserContainer = null;
@@ -149,7 +148,7 @@
Object element = iterator.next();
if (element instanceof IResource) {
if (element instanceof IFile) {
- if (((IFile) element).getName().toLowerCase().endsWith(CSS_FILE_EXTENTION)) {
+ if (((IFile) element).getName().toLowerCase().endsWith(Util.CSS_FILE_EXTENTION)) {
currentFile = (IFile)element;
}
}
@@ -581,7 +580,14 @@
* @return selector name
*/
public String getSelectorName() {
- return currentClassStyle;
+ String className = currentClassStyle;
+ if (currentClassStyle != null) {
+ className = currentClassStyle.replaceAll("\\.", Constants.EMPTY);
//$NON-NLS-1$
+ className = className.replaceAll("\\,", Constants.EMPTY);
+ className = className.replaceAll("\\s++", Constants.WHITE_SPACE);
//$NON-NLS-1$
+ }
+
+ return className;
}
/**
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/StyleComposite.java
===================================================================
---
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/StyleComposite.java 2008-11-26
09:50:06 UTC (rev 12066)
+++
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/StyleComposite.java 2008-11-26
10:59:13 UTC (rev 12067)
@@ -344,7 +344,14 @@
sc.setExpandHorizontal(true);
sc.setExpandVertical(true);
+ ManualChangeStyleListener[] listeners = null;
+ if (tabQuickEditControl != null) {
+ listeners = tabQuickEditControl.getManualChangeStyleListeners();
+ }
tabQuickEditControl = new TabQuickEditControl(sc, comboMap, styleAttributes);
+ if (listeners != null && listeners.length > 0) {
+ tabQuickEditControl.addManualChangeStyleListener(listeners[0]);
+ }
sc.setContent(tabQuickEditControl);
sc.setMinSize(tabQuickEditControl.computeSize(SWT.DEFAULT, SWT.DEFAULT));
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/Util.java
===================================================================
---
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/Util.java 2008-11-26
09:50:06 UTC (rev 12066)
+++
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/Util.java 2008-11-26
10:59:13 UTC (rev 12067)
@@ -39,6 +39,8 @@
*/
public class Util {
+ public static final String CSS_FILE_EXTENTION = "css"; //$NON-NLS-1$
+
private static String RGB = "rgb"; //$NON-NLS-1$
private static String THIN = "thin"; //$NON-NLS-1$
@@ -310,7 +312,7 @@
IEditorInput input = page.getActiveEditor().getEditorInput();
if (input instanceof IFileEditorInput) {
IFile file = ((IFileEditorInput) input).getFile();
- if (file.getName().toLowerCase().endsWith("css")) {
+ if (file.getName().toLowerCase().endsWith(CSS_FILE_EXTENTION)) {
return file;
}
}
@@ -319,7 +321,9 @@
}
/**
+ * Method return the name of CSS selector in opened CSS file.
*
+ * @return selector name
*/
public static String getActivePageCSSSelectorIfAny() {
IWorkbenchPage page =
JspEditorPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage();
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 2008-11-26
09:50:06 UTC (rev 12066)
+++
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/css/NewCSSClassWizard.java 2008-11-26
10:59:13 UTC (rev 12067)
@@ -79,7 +79,7 @@
*/
@Override
public boolean canFinish() {
- return page.showFinish;
+ return page.canFinish;
}
/**
@@ -102,7 +102,7 @@
private CSSClassDialog dialog;
- boolean showFinish = false;
+ boolean canFinish = false;
/**
* Constructor for SampleNewWizardPage.
@@ -167,22 +167,22 @@
case IStatus.OK:
setErrorMessage(null);
setMessage(message);
- showFinish = true;
+ canFinish = true;
break;
case IStatus.WARNING:
setErrorMessage(null);
- showFinish = true;
+ canFinish = true;
setMessage(message, WizardPage.WARNING);
break;
case IStatus.INFO:
setErrorMessage(null);
- showFinish = true;
+ canFinish = true;
setMessage(message, WizardPage.INFORMATION);
break;
default:
setErrorMessage(message);
setMessage(null);
- showFinish = false;
+ canFinish = false;
break;
}
}
Show replies by date