[jbosstools-commits] JBoss Tools SVN: r22807 - in trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui: editor/check and 1 other directory.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Tue Jun 15 08:35:06 EDT 2010
Author: yzhishko
Date: 2010-06-15 08:35:06 -0400 (Tue, 15 Jun 2010)
New Revision: 22807
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/JsfUIMessages.java
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/JSFNaturesInfoDialog.java
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/KBNaturesInfoDialog.java
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/ProjectNaturesChecker.java
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/ProjectNaturesInfoDialog.java
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/messages.properties
Log:
https://jira.jboss.org/browse/JBIDE-6409 - fixed
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/JsfUIMessages.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/JsfUIMessages.java 2010-06-15 12:05:29 UTC (rev 22806)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/JsfUIMessages.java 2010-06-15 12:35:06 UTC (rev 22807)
@@ -30,6 +30,17 @@
public static String EL_REFACTOR_RENAME_HANDLER_ERROR;
public static String RENAME_EL_VARIABLE_WIZARD_EL_VARIABLE_NAME;
+ public static String IS_JSF_CHECK_NEED;
+ public static String IS_KB_NATURE_CHECK_NEED;
+ public static String IS_JSF_NATURE_CHECK_NEED;
+ public static String ADD_JSF_CAPABILITIES_BUTTTON_LABEL;
+ public static String ENABLE_JSF_CAPABILITIES_TEXT;
+ public static String ENABLE_JSF_CODE_COMPLETION_BUTTON_LABEL;
+ public static String ENABLE_JSF_CODE_COMPLETION_TEXT;
+ public static String DONT_SHOW_CHECKER_DIALOG;
+ public static String MISSING_NATURES_INFO_MESSAGE_TITLE;
+ public static String SKIP_BUTTON_LABEL;
+
static {
// initialize resource bundle
NLS.initializeMessages(BUNDLE_NAME, JsfUIMessages.class);
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/JSFNaturesInfoDialog.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/JSFNaturesInfoDialog.java 2010-06-15 12:05:29 UTC (rev 22806)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/JSFNaturesInfoDialog.java 2010-06-15 12:35:06 UTC (rev 22807)
@@ -17,6 +17,7 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.swt.custom.BusyIndicator;
import org.eclipse.ui.PlatformUI;
+import org.jboss.tools.jsf.ui.JsfUIMessages;
import org.jboss.tools.jsf.ui.editor.check.wizards.AddJSFCapabilitiesWizard;
/**
@@ -27,10 +28,8 @@
public class JSFNaturesInfoDialog extends ProjectNaturesInfoDialog {
- private static final String fixButtonLabel = "Add JSF Capabilities..."; //$NON-NLS-1$
-
public JSFNaturesInfoDialog(IProject project) {
- super(project, fixButtonLabel);
+ super(project, JsfUIMessages.ADD_JSF_CAPABILITIES_BUTTTON_LABEL);
}
@Override
@@ -39,18 +38,15 @@
.getActiveWorkbenchWindow().getShell().getDisplay(),
new Runnable() {
public void run() {
- AddJSFCapabilitiesWizard.getInstance(project).run(
- null);
+ AddJSFCapabilitiesWizard.getInstance(project).run(null);
}
});
}
@Override
protected String getMessageInfo() {
- String dialogMessage = MessageFormat.format("JBoss Tools Editor might not fully work in project \"{0}" + //$NON-NLS-1$
- "\" because it does not have JSF and code completion enabled completely.\n\n" //$NON-NLS-1$
- + "Please use the Configure menu on the project or \"Add JSF Capabilities...\" fix button to enable JSF if " //$NON-NLS-1$
- + "you want all features of the editor working.",project.getName()); //$NON-NLS-1$
+ String dialogMessage = MessageFormat.format(
+ JsfUIMessages.ENABLE_JSF_CAPABILITIES_TEXT, project.getName());
return dialogMessage;
}
@@ -58,8 +54,8 @@
protected void skipButtonPressed() {
try {
project.setPersistentProperty(
- ProjectNaturesChecker.IS_JSF_NATURES_CHECK_NEED, Boolean
- .toString(!isRemember));
+ ProjectNaturesChecker.IS_JSF_NATURES_CHECK_NEED,
+ Boolean.toString(!isRemember));
} catch (CoreException e) {
}
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/KBNaturesInfoDialog.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/KBNaturesInfoDialog.java 2010-06-15 12:05:29 UTC (rev 22806)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/KBNaturesInfoDialog.java 2010-06-15 12:35:06 UTC (rev 22807)
@@ -30,6 +30,7 @@
import org.eclipse.ui.ide.IDE;
import org.eclipse.ui.internal.views.markers.MarkerSupportInternalUtilities;
import org.eclipse.ui.views.markers.internal.MarkerMessages;
+import org.jboss.tools.jsf.ui.JsfUIMessages;
import org.jboss.tools.jsf.ui.JsfUiPlugin;
import org.jboss.tools.jsf.ui.editor.check.wizards.QuickFixWizard;
import org.jboss.tools.jst.web.kb.internal.KbProject;
@@ -43,10 +44,8 @@
@SuppressWarnings("restriction")
public class KBNaturesInfoDialog extends ProjectNaturesInfoDialog {
- private static final String fixButtonLabel = "Enable JSF Code Completion..."; //$NON-NLS-1$
-
public KBNaturesInfoDialog(IProject project) {
- super(project, fixButtonLabel);
+ super(project, JsfUIMessages.ENABLE_JSF_CODE_COMPLETION_BUTTON_LABEL);
}
@Override
@@ -95,10 +94,9 @@
@Override
protected String getMessageInfo() {
- String dialogMessage = MessageFormat.format("The project \"{0}" + //$NON-NLS-1$
- "\" does not have JSF code completion and validation enabled completely.\n\n" //$NON-NLS-1$
- + "Please use \"Enabale JSF Code Completion...\" fix button if " //$NON-NLS-1$
- + "you want these features working.",project.getName()); //$NON-NLS-1$
+ String dialogMessage = MessageFormat.format(
+ JsfUIMessages.ENABLE_JSF_CODE_COMPLETION_TEXT,
+ project.getName());
return dialogMessage;
}
@@ -120,8 +118,8 @@
protected void skipButtonPressed() {
try {
project.setPersistentProperty(
- ProjectNaturesChecker.IS_KB_NATURES_CHECK_NEED, Boolean
- .toString(!isRemember));
+ ProjectNaturesChecker.IS_KB_NATURES_CHECK_NEED,
+ Boolean.toString(!isRemember));
} catch (CoreException e) {
}
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/ProjectNaturesChecker.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/ProjectNaturesChecker.java 2010-06-15 12:05:29 UTC (rev 22806)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/ProjectNaturesChecker.java 2010-06-15 12:35:06 UTC (rev 22807)
@@ -12,13 +12,11 @@
import java.util.HashSet;
import java.util.Set;
-
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResourceChangeEvent;
import org.eclipse.core.resources.IResourceChangeListener;
import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.QualifiedName;
import org.eclipse.jdt.core.IJavaElement;
@@ -29,6 +27,7 @@
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PlatformUI;
import org.jboss.tools.common.reporting.ProblemReportingHelper;
+import org.jboss.tools.jsf.ui.JsfUIMessages;
import org.jboss.tools.jst.jsp.JspEditorPlugin;
import org.jboss.tools.jst.jsp.util.FileUtil;
import org.jboss.tools.jst.web.kb.IKbProject;
@@ -46,11 +45,11 @@
private ProjectNaturesPartListener partListener = new ProjectNaturesPartListener();
private static final String SEARCH_CLASS = "javax.faces.webapp.FacesServlet"; //$NON-NLS-1$
public static final QualifiedName IS_JSF_NATURES_CHECK_NEED = new QualifiedName(
- "", "Is JSF natures check"); //$NON-NLS-1$ //$NON-NLS-2$
+ "", JsfUIMessages.IS_JSF_NATURE_CHECK_NEED); //$NON-NLS-1$
public static final QualifiedName IS_KB_NATURES_CHECK_NEED = new QualifiedName(
- "", "Is KB natures check"); //$NON-NLS-1$ //$NON-NLS-2$
+ "", JsfUIMessages.IS_KB_NATURE_CHECK_NEED); //$NON-NLS-1$
public static final QualifiedName IS_JSF_CHECK_NEED = new QualifiedName(
- "", "Is JSF check"); //$NON-NLS-1$ //$NON-NLS-2$
+ "", JsfUIMessages.IS_JSF_CHECK_NEED); //$NON-NLS-1$
private Set<IProject> projectsCollection;
private static final String STRUTS_NATURE_ID = "org.jboss.tools.struts.strutsnature"; //$NON-NLS-1$
@@ -173,10 +172,10 @@
if (project.getPersistentProperty(IS_JSF_NATURES_CHECK_NEED) == null) {
project
.setPersistentProperty(IS_JSF_NATURES_CHECK_NEED,
- "true"); //$NON-NLS-1$
+ Boolean.TRUE.toString());
}
if (project.getPersistentProperty(IS_KB_NATURES_CHECK_NEED) == null) {
- project.setPersistentProperty(IS_KB_NATURES_CHECK_NEED, "true"); //$NON-NLS-1$
+ project.setPersistentProperty(IS_KB_NATURES_CHECK_NEED, Boolean.TRUE.toString());
}
}
}
@@ -222,12 +221,12 @@
IJavaElement javaElement = FileUtil.searchForClass(JavaCore
.create(project), SEARCH_CLASS);
if (javaElement == null) {
- project.setPersistentProperty(IS_JSF_CHECK_NEED, "false"); //$NON-NLS-1$
+ project.setPersistentProperty(IS_JSF_CHECK_NEED, Boolean.FALSE.toString());
} else {
- project.setPersistentProperty(IS_JSF_CHECK_NEED, "true"); //$NON-NLS-1$
+ project.setPersistentProperty(IS_JSF_CHECK_NEED, Boolean.TRUE.toString());
}
} catch (CoreException e) {
- project.setPersistentProperty(IS_JSF_CHECK_NEED, "false"); //$NON-NLS-1$
+ project.setPersistentProperty(IS_JSF_CHECK_NEED, Boolean.FALSE.toString());
}
}
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/ProjectNaturesInfoDialog.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/ProjectNaturesInfoDialog.java 2010-06-15 12:05:29 UTC (rev 22806)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/ProjectNaturesInfoDialog.java 2010-06-15 12:35:06 UTC (rev 22807)
@@ -28,6 +28,7 @@
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.browser.IWorkbenchBrowserSupport;
import org.jboss.tools.common.reporting.ProblemReportingHelper;
+import org.jboss.tools.jsf.ui.JsfUIMessages;
import org.jboss.tools.jst.jsp.JspEditorPlugin;
import org.jboss.tools.jst.jsp.messages.JstUIMessages;
@@ -42,14 +43,12 @@
private Button button;
private Link link;
protected boolean isRemember = false;
- private static final String QUESTION = "Do not show this dialog again!"; //$NON-NLS-1$
- private static final String TITLE = "Missing Natures"; //$NON-NLS-1$
protected IProject project;
protected ProjectNaturesInfoDialog(IProject project, String fixButtonLabel) {
super(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
- TITLE, null, "", INFORMATION, //$NON-NLS-1$
- new String[] { fixButtonLabel, "Skip" }, 0); //$NON-NLS-1$
+ JsfUIMessages.MISSING_NATURES_INFO_MESSAGE_TITLE, null, "", INFORMATION, //$NON-NLS-1$
+ new String[] { fixButtonLabel, JsfUIMessages.SKIP_BUTTON_LABEL }, 0);
this.project = project;
message = getMessageInfo();
}
@@ -74,7 +73,7 @@
isRemember = !isRemember;
}
});
- button.setText(QUESTION);
+ button.setText(JsfUIMessages.DONT_SHOW_CHECKER_DIALOG);
link = new Link(parent, SWT.NONE);
gridData = new GridData(GridData.HORIZONTAL_ALIGN_END);
gridData.grabExcessHorizontalSpace = true;
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/messages.properties
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/messages.properties 2010-06-15 12:05:29 UTC (rev 22806)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/messages.properties 2010-06-15 12:35:06 UTC (rev 22807)
@@ -31,3 +31,13 @@
NewXHTMLTemplatesWizardPage_5=&Preview:
NewXHTMLTemplatesWizardPage_6=Templates are 'New XHTML' templates found in the <a>XHTML Templates</a> preference page.
NewXHTMLTemplatesWizardPage_7=&Templates:
+IS_JSF_CHECK_NEED=Is JSF check
+IS_KB_NATURE_CHECK_NEED=Is KB natures check
+IS_JSF_NATURE_CHECK_NEED=Is JSF natures check
+ADD_JSF_CAPABILITIES_BUTTTON_LABEL=Add JSF Capabilities...
+ENABLE_JSF_CAPABILITIES_TEXT=JBoss Tools Editor might not fully work in project "{0}" because it does not have JSF and code completion enabled completely.\n\nPlease use the Configure menu on the project or "Add JSF Capabilities..." fix button to enable JSF if you want all features of the editor working.
+ENABLE_JSF_CODE_COMPLETION_BUTTON_LABEL=Enable JSF Code Completion...
+ENABLE_JSF_CODE_COMPLETION_TEXT=The project "{0}" does not have JSF code completion and validation enabled completely.\n\nPlease use "Enabale JSF Code Completion..." fix button if you want these features working.
+DONT_SHOW_CHECKER_DIALOG=Do not show this dialog again!
+MISSING_NATURES_INFO_MESSAGE_TITLE=Missing Natures
+SKIP_BUTTON_LABEL=Skip
\ No newline at end of file
More information about the jbosstools-commits
mailing list