July 2009 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r16818 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs.

by jbosstools-commits＠lists.jboss.org

Author: sdzmitrovich Date: 2009-07-27 11:03:34 -0400 (Mon, 27 Jul 2009) New Revision: 16818 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabPropertySheetControl.java Log: correct problem in windows - control doesn't appear after click at the second column Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabPropertySheetControl.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabPropertySheetControl.java 2009-07-27 14:36:21 UTC (rev 16817) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabPropertySheetControl.java 2009-07-27 15:03:34 UTC (rev 16818) @@ -58,7 +58,8 @@ super(bindingContext, styleAttributes, parent, SWT.NONE); setLayout(new FillLayout()); - tree = new Tree(this, SWT.NONE); + tree = new Tree(this, SWT.FULL_SELECTION | SWT.SINGLE + | SWT.HIDE_SELECTION); tree.setHeaderVisible(true); tree.setLinesVisible(true);

16 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r16817 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs.

by jbosstools-commits＠lists.jboss.org

Author: sdzmitrovich Date: 2009-07-27 10:36:21 -0400 (Mon, 27 Jul 2009) New Revision: 16817 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabPropertySheetControl.java Log: correct problem in windows - size of control is changed after click Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabPropertySheetControl.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabPropertySheetControl.java 2009-07-27 13:43:52 UTC (rev 16816) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabPropertySheetControl.java 2009-07-27 14:36:21 UTC (rev 16817) @@ -122,8 +122,9 @@ editor.minimumWidth = size.x; editor.minimumHeight = size.y; - tree.getColumn(VALUE_ATTRIBUTE_COLUMN).setWidth( - editor.minimumWidth); + if (tree.getColumn(VALUE_ATTRIBUTE_COLUMN).getWidth() < editor.minimumWidth) + tree.getColumn(VALUE_ATTRIBUTE_COLUMN).setWidth( + editor.minimumWidth); editor.setEditor(newEditor, item, VALUE_ATTRIBUTE_COLUMN); }

16 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r16816 - trunk/smooks/docs/reference/en/images/source_editor.

by jbosstools-commits＠lists.jboss.org

Author: abogachuk Date: 2009-07-27 09:43:52 -0400 (Mon, 27 Jul 2009) New Revision: 16816 Added: trunk/smooks/docs/reference/en/images/source_editor/smooks_conf_validator.png trunk/smooks/docs/reference/en/images/source_editor/smooks_conf_validator_settings.png Log: https://jira.jboss.org/jira/browse/JBDS-773 - screenshots of smooks conf file validator are added. Added: trunk/smooks/docs/reference/en/images/source_editor/smooks_conf_validator.png =================================================================== (Binary files differ) Property changes on: trunk/smooks/docs/reference/en/images/source_editor/smooks_conf_validator.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/docs/reference/en/images/source_editor/smooks_conf_validator_settings.png =================================================================== (Binary files differ) Property changes on: trunk/smooks/docs/reference/en/images/source_editor/smooks_conf_validator_settings.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

16 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r16815 - trunk/smooks/docs/reference/en/modules.

by jbosstools-commits＠lists.jboss.org

Author: abogachuk Date: 2009-07-27 09:42:54 -0400 (Mon, 27 Jul 2009) New Revision: 16815 Modified: trunk/smooks/docs/reference/en/modules/smooksformeditor_sourcepage.xml Log: https://jira.jboss.org/jira/browse/JBDS-773 - smooks conf file validator described Modified: trunk/smooks/docs/reference/en/modules/smooksformeditor_sourcepage.xml =================================================================== --- trunk/smooks/docs/reference/en/modules/smooksformeditor_sourcepage.xml 2009-07-27 08:41:48 UTC (rev 16814) +++ trunk/smooks/docs/reference/en/modules/smooksformeditor_sourcepage.xml 2009-07-27 13:42:54 UTC (rev 16815) @@ -42,7 +42,42 @@ <para> You can't edit the configuration file with other editors until file becomes valid. </para> </note--> + + + + </section> + + <section> + <title>Smooks Configuration File Validator</title> + <para>Smooks configuration file validator will validate your Smooks configuration file. Just right-click on the file and then click on the <property>Validate</property> button. The validator can be enabled/disabled in <emphasis><property>Window -> Preferences -> Validation</property></emphasis>:</para> + + <figure> + <title>Validation: Smooks Configuration File Validator</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/source_editor/smooks_conf_validator.png" scale="90"/> + </imageobject> + </mediaobject> + </figure> + + <para>You can set up your Smooks validator to include, exclude groups to validate and specify rules for validation. Just click on the <property>Settings</property> button and use the options provided:</para> + + <figure> + <title>Smooks Configuration File Validator Settings</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/source_editor/smooks_conf_validator_settings.png" scale="90"/> + </imageobject> + </mediaobject> + </figure> + + <para>We hope, our guide will help you to get started with JBoss Smooks Tools. Besides, for additional information you are welcome on <ulink url="http://www.jboss.com/index.html?module=bb&op=viewforum&f=201">JBoss forum</ulink>.</para> + </section> + + + + </chapter>

16 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r16814 - trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wizard.

by jbosstools-commits＠lists.jboss.org

Author: koen.aers(a)jboss.com Date: 2009-07-27 04:41:48 -0400 (Mon, 27 Jul 2009) New Revision: 16814 Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wizard/AddJpdl4SupportWizard.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wizard/ChooseJpdl4RuntimePage.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wizard/ConfigureJpdl4RuntimePage.java Log: wizard to add jpdl4 support to java projects (start) Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wizard/AddJpdl4SupportWizard.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wizard/AddJpdl4SupportWizard.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wizard/AddJpdl4SupportWizard.java 2009-07-27 08:41:48 UTC (rev 16814) @@ -0,0 +1,482 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.tools.flow.jpdl4.wizard; + +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.wizard.Wizard; +import org.eclipse.ui.INewWizard; +import org.eclipse.ui.IWorkbench; + +public class AddJpdl4SupportWizard extends Wizard implements INewWizard { + + @Override + public boolean performFinish() { + // TODO Auto-generated method stub + return false; + } + + public void init(IWorkbench workbench, IStructuredSelection selection) { + // TODO Auto-generated method stub + + } + +// private WizardNewProjectCreationPage mainPage; +// private ConfigureJpdl4RuntimePage configureRuntimePage; +// private ChooseJpdl4RuntimePage coreJbpmPage; +// private IProject newProject; +// private IWorkbench workbench; +// +//// public boolean canFinish() { +//// return super.canFinish() && coreJbpmPage.combo.getItemCount() > 0 && coreJbpmPage.combo.getSelectionIndex() != -1; +//// } +// +// public void init(IWorkbench w, IStructuredSelection currentSelection) { +// this.workbench = w; +// setNeedsProgressMonitor(true); +// setWindowTitle("Add jPDL 4 Support"); +// } +// +// public void addPages() { +//// addMainPage(); +// if (!isRuntimeAvailable()) { +// addConfigureRuntimePage(); +// } +// addChooseRuntimePage(); +// } +// +// private boolean isRuntimeAvailable() { +// return !PreferencesManager.INSTANCE.getJbpmInstallationMap().isEmpty(); +// } +// +// private void addConfigureRuntimePage() { +// configureRuntimePage = new ConfigureJpdl4RuntimePage(); +// addPage(configureRuntimePage); +// } +// +// private void addChooseRuntimePage() { +// coreJbpmPage = new ChooseJpdl4RuntimePage(); +// addPage(coreJbpmPage); +// } +// +// private void addMainPage() { +// super.addPages(); +// setWindowTitle("New Process Project"); +// mainPage = new WizardNewProjectCreationPage("basicNewProjectPage"); +// mainPage.setTitle("Process Project"); +// mainPage.setDescription("Create a new process project."); +// addPage(mainPage); +// } +// +// private IProject createNewProject() { +// final IProject newProjectHandle = mainPage.getProjectHandle(); +// final IProjectDescription description = createProjectDescription(newProjectHandle); +// WorkspaceModifyOperation op = new WorkspaceModifyOperation() { +// protected void execute(IProgressMonitor monitor) +// throws CoreException { +// createProject(description, newProjectHandle, monitor); +// } +// }; +// runProjectCreationOperation(op, newProjectHandle); +// return newProjectHandle; +// } +// +// private void addJRELibraries(IJavaProject javaProject) throws JavaModelException { +// ArrayList entries = new ArrayList(); +// entries.addAll(Arrays.asList(javaProject.getRawClasspath())); +// entries.addAll(Arrays.asList(PreferenceConstants.getDefaultJRELibrary())); +// javaProject.setRawClasspath((IClasspathEntry[])entries.toArray(new IClasspathEntry[entries.size()]), null); +// } +// +// private void addSourceFolders(IJavaProject javaProject) throws JavaModelException, CoreException { +// ArrayList entries = new ArrayList(); +// entries.addAll(Arrays.asList(javaProject.getRawClasspath())); +// addSourceFolder(javaProject, entries, "src/main/java"); +// addSourceFolder(javaProject, entries, "src/main/config"); +// addSourceFolder(javaProject, entries, "src/main/jpdl"); +// addSourceFolder(javaProject, entries, "src/test/java"); +// javaProject.setRawClasspath((IClasspathEntry[])entries.toArray(new IClasspathEntry[entries.size()]), null); +// } +// +// private void addSourceFolder(IJavaProject javaProject, ArrayList entries, String path) throws CoreException { +// IFolder folder = javaProject.getProject().getFolder(path); +// createFolder(folder); +// IPackageFragmentRoot root = javaProject.getPackageFragmentRoot(folder); +// entries.add(JavaCore.newSourceEntry(root.getPath())); +// } +// +// private void createFolder(IFolder folder) throws CoreException { +// IContainer parent = folder.getParent(); +// if (parent != null && !parent.exists() && parent instanceof IFolder) { +// createFolder((IFolder)parent); +// } +// folder.create(true, true, null); +// } +// +// private JbpmInstallation getJbpmInstallation() { +// return PreferencesManager.INSTANCE.getJbpmInstallation(getCoreJbpmName()); +// } +// +// private void createJbpmLibraryContainer(IJavaProject javaProject) throws JavaModelException { +// JavaCore.setClasspathContainer( +// new Path("JBPM/" + getJbpmInstallation().name), +// new IJavaProject[] { javaProject }, +// new IClasspathContainer[] { new JbpmClasspathContainer(javaProject, getJbpmInstallation()) }, +// null); +// } +// +// private String getCoreJbpmName() { +// return coreJbpmPage.getCoreJbpmName(); +// } +// +// private void addJbpmLibraries(IJavaProject javaProject) throws JavaModelException { +// createJbpmLibraryContainer(javaProject); +// ArrayList entries = new ArrayList(); +// entries.addAll(Arrays.asList(javaProject.getRawClasspath())); +// entries.add(JavaCore.newContainerEntry(new Path("JBPM/" + getJbpmInstallation().name))); +// javaProject.setRawClasspath((IClasspathEntry[])entries.toArray(new IClasspathEntry[entries.size()]), null); +// } +// +// private void createOutputLocation(IJavaProject javaProject) throws JavaModelException, CoreException { +// IFolder binFolder = javaProject.getProject().getFolder("bin"); +// createFolder(binFolder); +// IPath outputLocation = binFolder.getFullPath(); +// javaProject.setOutputLocation(outputLocation, null); +// } +// +// private void addJavaBuilder(IJavaProject javaProject) throws CoreException { +// IProjectDescription desc = javaProject.getProject().getDescription(); +// ICommand command = desc.newCommand(); +// command.setBuilderName(JavaCore.BUILDER_ID); +// desc.setBuildSpec(new ICommand[] { command }); +// javaProject.getProject().setDescription(desc, null); +// } +// +// private void createJavaProject() { +// try { +// newProject = createNewProject(); +// newProject.setPersistentProperty(new QualifiedName("", "jbpmName"), getCoreJbpmName()); +// IJavaProject javaProject = JavaCore.create(newProject); +// createOutputLocation(javaProject); +// addJavaBuilder(javaProject); +// setClasspath(javaProject); +// createInitialContent(javaProject); +// newProject.build(IncrementalProjectBuilder.FULL_BUILD, null); +// } catch (JavaModelException e) { +// ErrorDialog.openError(getShell(), "Problem creating java project", null, e.getStatus()); +// } catch (CoreException e) { +// ErrorDialog.openError(getShell(), "Problem creating java project", null, e.getStatus()); +// } catch (IOException e) { +// ErrorDialog.openError(getShell(), "Problem creating java project", null, null); +// } +// } +// +// private void createInitialContent(IJavaProject javaProject) throws CoreException, JavaModelException, IOException { +// if (coreJbpmPage.checkbox.getSelection()) { +// createMessageActionHandler(javaProject); +// createSimpleProcessTest(javaProject); +// createSimpleProcessDefinition(javaProject); +// } +// copyJbpmResources(javaProject); +// } +// +// private void createSimpleProcessDefinition(IJavaProject javaProject) throws CoreException, JavaModelException, IOException { +// JbpmInstallation jbpmInstallation = PreferencesManager.INSTANCE.getJbpmInstallation(getCoreJbpmName()); +// if (jbpmInstallation == null) return; +//// IFolder processesFolder = javaProject.getProject().getFolder("processes"); +//// if (!processesFolder.exists()) { +//// processesFolder.create(true, true, null); +//// } +// IFolder folder = javaProject.getProject().getFolder("src/main/jpdl/simple"); +// if (!folder.exists()) { +// folder.create(true, true, null); +// } +// String location = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(jbpmInstallation.location); +// String fromPath = getLocation("examples", location); +// if (fromPath == null) { +// fromPath = "/src/process.examples/simple.par"; +// } else { +// fromPath = fromPath + "/simple/src/main/jpdl"; +// } +// fromPath = new Path(location).append(fromPath).toOSString(); +// File fromDir = new File(fromPath); +// if (!fromDir.exists()) return; +// File[] files = fromDir.listFiles(); +// for (int i = 0; i < files.length; i++) { +// copyJbpmResource(files[i], folder); +// } +// } +// +// private void createSimpleProcessTest(IJavaProject javaProject) throws JavaModelException, IOException { +// String resourceName = "org/jbpm/gd/jpdl/resource/SimpleProcessTest.java.template"; +// IFolder folder = javaProject.getProject().getFolder("src/test/java"); +// IPackageFragmentRoot root = javaProject.getPackageFragmentRoot(folder); +// IPackageFragment pack = root.createPackageFragment("com.sample", true, null); +// InputStream stream = getClass().getClassLoader().getResourceAsStream(resourceName); +// byte[] content = readStream(stream); +// pack.createCompilationUnit("SimpleProcessTest.java", new String(content), true, null); +// } +// +// private void createMessageActionHandler(IJavaProject javaProject) throws JavaModelException, IOException { +// String resourceName = "org/jbpm/gd/jpdl/resource/MessageActionHandler.java.template"; +// IFolder folder = javaProject.getProject().getFolder("src/main/java"); +// IPackageFragmentRoot root = javaProject.getPackageFragmentRoot(folder); +// IPackageFragment pack = root.createPackageFragment("com.sample.action", true, null); +// InputStream stream = getClass().getClassLoader().getResourceAsStream(resourceName); +// byte[] content = readStream(stream); +// pack.createCompilationUnit("MessageActionHandler.java", new String(content), true, null); +// } +// +// private void copyJbpmResources(IJavaProject javaProject) throws CoreException { +// JbpmInstallation jbpmInstallation = PreferencesManager.INSTANCE.getJbpmInstallation(getCoreJbpmName()); +// if (jbpmInstallation == null) return; +// String location = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(jbpmInstallation.location); +// IFolder folder = javaProject.getProject().getFolder("src/main/config"); +// String fromPath = getLocation("config", location); +// if (fromPath == null) { +// fromPath = "/src/config.files"; +// } +// fromPath = new Path(location).append(fromPath).toOSString(); +// File fromDir = new File(fromPath); +// if (!fromDir.exists()) return; +// File[] files = fromDir.listFiles(); +// for (int i = 0; i < files.length; i++) { +// if (!files[i].isDirectory()) { +// copyJbpmResource(files[i], folder); +// } +// } +// } +// +// private String getLocation(String selector, String baseLocation) { +// String result = null; +// try { +// IPath locationPath = new Path(baseLocation); +// Document document = new SAXReader().read(locationPath.append("src/resources/gpd/version.info.xml").toFile()); +// XPath xpath = document.createXPath("/jbpm-version-info/" + selector); +// List list = xpath.selectNodes(document); +// if (!list.isEmpty()) { +// result = (String)((Element)list.get(0)).attribute("path").getData(); +// } +// } +// catch (MalformedURLException e) { } +// catch (DocumentException e) { } +// return result; +// } +// +// private void copyJbpmResource(File source, IFolder destination) throws CoreException { +// try { +// IFile file = destination.getFile(source.getName()); +// file.create(new FileInputStream(source), true, null); +// } catch (FileNotFoundException e) { +// e.printStackTrace(); +// } +// } +// +// private void setClasspath(IJavaProject javaProject) throws JavaModelException, CoreException { +// javaProject.setRawClasspath(new IClasspathEntry[0], null); +// addSourceFolders(javaProject); +// addJRELibraries(javaProject); +// addJbpmLibraries(javaProject); +// // Hack to overcome the problems of the classpath container not being created in the classpath. +// javaProject.getRawClasspath(); +// } +// +// private IProjectDescription createProjectDescription( +// IProject newProjectHandle) { +// IPath newPath = null; +// if (!mainPage.useDefaults()) +// newPath = mainPage.getLocationPath(); +// IWorkspace workspace = ResourcesPlugin.getWorkspace(); +// IProjectDescription description = workspace +// .newProjectDescription(newProjectHandle.getName()); +// description.setLocation(newPath); +// addJavaNature(description); +// return description; +// } +// +// private void addJavaNature(IProjectDescription description) { +// ArrayList natures = new ArrayList(); +// natures.addAll(Arrays.asList(description.getNatureIds())); +// natures.add(JavaCore.NATURE_ID); +// description.setNatureIds((String[])natures.toArray(new String[natures.size()])); +// } +// +// private void runProjectCreationOperation(WorkspaceModifyOperation op, +// IProject newProjectHandle) { +// try { +// getContainer().run(false, true, op); +// } catch (InterruptedException e) { +// Logger.logError("InterruptedException while creating project", e); +// } catch (InvocationTargetException e) { +// Throwable t = e.getTargetException(); +// if (t instanceof CoreException) { +// handleCoreException(newProjectHandle, (CoreException) t); +// } else { +// handleOtherProblem(t); +// } +// } +// } +// +// private void handleOtherProblem(Throwable t) { +// MessageDialog.openError(getShell(), "Creation Problems", +// "Internal error: " + t.getMessage()); +// } +// +// private void handleCoreException(final IProject newProjectHandle, +// CoreException e) { +// if (e.getStatus().getCode() == IResourceStatus.CASE_VARIANT_EXISTS) { +// MessageDialog +// .openError( +// getShell(), +// "Creation Problems", +// "The underlying file system is case insensitive. There is an existing project which conflicts with '" +// + newProjectHandle.getName() + "'."); +// } else { +// ErrorDialog.openError(getShell(), "Creation Problems", null, e +// .getStatus()); +// } +// } +// +// void createProject(IProjectDescription description, IProject projectHandle, +// IProgressMonitor monitor) throws CoreException, +// OperationCanceledException { +// try { +// monitor.beginTask("", 2000); +// projectHandle.create(description, new SubProgressMonitor(monitor, +// 1000)); +// if (monitor.isCanceled()) { +// throw new OperationCanceledException(); +// } +// projectHandle.open(IResource.BACKGROUND_REFRESH, +// new SubProgressMonitor(monitor, 1000)); +// } finally { +// monitor.done(); +// } +// } +// +// public IProject getNewProject() { +// return newProject; +// } +// +// public boolean performFinish() { +// if (!isRuntimeAvailable()) { +// addNewJpdl4Runtime(); +// } +// addJpdl4ClasspathContainer(); +// return true; +// } +// +// private void addNewJpdl4Runtime() { +//// String name = configureRuntimePage.nameText.getText(); +//// String location = configureRuntimePage.locationText.getText(); +//// String version = configureRuntimePage.versionText.getText(); +//// PreferencesManager.INSTANCE.initializeDefaultJbpmInstallation(name, location, version); +// } +// +// protected void updatePerspective() { +// try { +// IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(); +// if (page.findView("org.eclipse.ui.views.PropertySheet") == null) { +// page.showView("org.eclipse.ui.views.PropertySheet"); +// } +// } catch (PartInitException e) { +// e.printStackTrace(); +// } +// } +// +// protected void selectAndReveal(IResource newResource) { +// selectAndReveal(newResource, workbench.getActiveWorkbenchWindow()); +// } +// +// private void selectAndReveal(IResource resource, +// IWorkbenchWindow window) { +// if (!inputValid(resource, window)) return; +// Iterator itr = getParts(window.getActivePage()).iterator(); +// while (itr.hasNext()) { +// selectAndRevealTarget( +// window, +// new StructuredSelection(resource), +// getTarget((IWorkbenchPart)itr.next())); +// } +// } +// +// private boolean inputValid(IResource resource, IWorkbenchWindow window) { +// if (window == null || resource == null) return false; +// else if (window.getActivePage() == null) return false; +// else return true; +// } +// +// private void selectAndRevealTarget(IWorkbenchWindow window, final ISelection selection, ISetSelectionTarget target) { +// if (target == null) return; +// final ISetSelectionTarget finalTarget = target; +// window.getShell().getDisplay().asyncExec(new Runnable() { +// public void run() { +// finalTarget.selectReveal(selection); +// } +// }); +// } +// +// private ISetSelectionTarget getTarget(IWorkbenchPart part) { +// ISetSelectionTarget target = null; +// if (part instanceof ISetSelectionTarget) { +// target = (ISetSelectionTarget)part; +// } +// else { +// target = (ISetSelectionTarget)part.getAdapter(ISetSelectionTarget.class); +// } +// return target; +// } +// +// private List getParts(IWorkbenchPage page) { +// List result = new ArrayList(); +// addParts(result, page.getViewReferences()); +// addParts(result, page.getEditorReferences()); +// return result; +// } +// +// private void addParts(List parts, IWorkbenchPartReference[] refs) { +// for (int i = 0; i < refs.length; i++) { +// IWorkbenchPart part = refs[i].getPart(false); +// if (part != null) { +// parts.add(part); +// } +// } +// } +// +// private byte[] readStream(InputStream in) throws IOException { +// byte[] contents = null; +// int fileSize = 0; +// byte[] buffer = new byte[1024]; +// int bytesRead = in.read(buffer); +// while (bytesRead != -1) { +// byte[] newContents = new byte[fileSize + bytesRead]; +// if (fileSize > 0) { +// System.arraycopy(contents, 0, newContents, 0, fileSize); +// } +// System.arraycopy(buffer, 0, newContents, fileSize, bytesRead); +// contents = newContents; +// fileSize += bytesRead; +// bytesRead = in.read(buffer); +// } +// return contents; +// } + +} \ No newline at end of file Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wizard/AddJpdl4SupportWizard.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wizard/ChooseJpdl4RuntimePage.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wizard/ChooseJpdl4RuntimePage.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wizard/ChooseJpdl4RuntimePage.java 2009-07-27 08:41:48 UTC (rev 16814) @@ -0,0 +1,119 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.tools.flow.jpdl4.wizard; + +import java.util.Iterator; + +import org.eclipse.jface.wizard.WizardPage; +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Combo; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Group; +import org.jboss.tools.jbpm.preferences.PreferencesManager; + +public class ChooseJpdl4RuntimePage extends WizardPage { + + Combo combo; + Button checkbox; + + public ChooseJpdl4RuntimePage() { + super("Process Project Details"); + setTitle("Choose Process Project Details"); + setDescription("Choose Process Project Details"); + } + + public void createControl(Composite parent) { + Composite composite = createClientArea(parent); + createCoreVersionGroup(composite); + createGenerateTemplateGroup(composite); + setControl(composite); + } + + private void createCoreVersionGroup(Composite composite) { + Group group = new Group(composite, SWT.NONE); + group.setText("Choose the Core jBPM Location for this project"); + group.setLayout(new GridLayout()); + group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + createCombo(group); + } + + private void createGenerateTemplateGroup(Composite composite) { + Group group = new Group(composite, SWT.NONE); + group.setText("Check to enable generation of sample files in the project"); + group.setLayout(new GridLayout()); + group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + createCheckbox(group); + } + + private void createCheckbox(Composite composite) { + checkbox = new Button(composite, SWT.CHECK); + checkbox.setText("Generate simple process definition, action handler and JUnit test"); + checkbox.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + checkbox.setSelection(true); + } + + private void createCombo(Composite composite) { + combo = new Combo(composite, SWT.DROP_DOWN | SWT.READ_ONLY); + combo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + fillComboWithPreferenceRuntimes(); + combo.addSelectionListener(new SelectionAdapter() { + public void widgetSelected(SelectionEvent e) { + setPageComplete(combo.getSelectionIndex() != -1); + } + + }); + } + + private void fillComboWithPreferenceRuntimes() { +// Iterator iterator = PreferencesManager.INSTANCE.getJbpmInstallationMap().keySet().iterator(); +// int counter = 0; +// while (iterator.hasNext()) { +// counter++; +// String next = (String)iterator.next(); +// combo.add(next); +// if (PreferencesManager.INSTANCE.getPreferredJbpmName().equals(next)) { +// combo.select(counter - 1); +// } +// } + } + + private Composite createClientArea(Composite parent) { + Composite composite= new Composite(parent, SWT.NONE); + GridLayout layout= new GridLayout(); + layout.marginWidth= 0; + layout.marginHeight= 0; + layout.numColumns= 1; + composite.setLayout(layout); + return composite; + } + + public String getCoreJbpmName() { + String result = combo.getItem(combo.getSelectionIndex()); + return result; + } + +} Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wizard/ChooseJpdl4RuntimePage.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wizard/ConfigureJpdl4RuntimePage.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wizard/ConfigureJpdl4RuntimePage.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wizard/ConfigureJpdl4RuntimePage.java 2009-07-27 08:41:48 UTC (rev 16814) @@ -0,0 +1,243 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.tools.flow.jpdl4.wizard; + +import java.io.File; +import java.net.MalformedURLException; + +import org.eclipse.core.runtime.Path; +import org.eclipse.jface.wizard.WizardPage; +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.ModifyEvent; +import org.eclipse.swt.events.ModifyListener; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.program.Program; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.DirectoryDialog; +import org.eclipse.swt.widgets.Group; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Link; +import org.eclipse.swt.widgets.Text; +import org.w3c.dom.Document; + +public class ConfigureJpdl4RuntimePage extends WizardPage { + + private static final String ENTER_NAME_MSG = "Choose a name for the JBoss jBPM Runtime, e.g. 'jBPM jPDL 3.2.2'"; + private static final String ENTER_LOCATION_MSG = "Enter or search a location for the JBoss jBPM Runtime"; + private static final String CONTINUE_MSG = "Press next to continue the project creation"; + private static final String UNEXISTING_LOCATION_MSG = "This location does not exist"; + private static final String INVALID_LOCATION_MSG = "This location does not contain a valid JBoss jBPM runtime, please retry"; + + Text nameText, locationText, versionText; + + public ConfigureJpdl4RuntimePage() { + super("Configure JBoss jBPM Runtime"); + setTitle("Configure JBoss jBPM Runtime"); + setMessage(ENTER_NAME_MSG); + } + + public void createControl(Composite parent) { + Composite composite = createClientArea(parent); + createLocateJbpmRuntimeGroup(composite); + createSpace(composite); + createDownloadJbpmRuntimeLink(composite); + setControl(composite); + } + + private void update() { + updateMessage(); + updateVersion(); + updatePages(); + } + + private void updatePages() { + setPageComplete(!isNameEmpty() && !isLocationEmpty() && !isVersionEmpty()); + if (!isNameEmpty()) { + ChooseJpdl4RuntimePage page = (ChooseJpdl4RuntimePage)getNextPage(); + page.combo.removeAll(); + page.combo.add(nameText.getText()); + page.combo.select(0); + } + } + + private void createSpace(Composite composite) { + Label label = new Label(composite, SWT.NONE); + label.setLayoutData(new GridData(GridData.FILL_BOTH)); + } + + private void createDownloadJbpmRuntimeLink(Composite composite) { + Link link = new Link(composite, SWT.NONE); + link.setText("<a>Download the JBoss jBPM package if you have none available yet.</a>"); + GridData gridData = new GridData(GridData.FILL_HORIZONTAL); + gridData.horizontalAlignment = SWT.CENTER; + gridData.verticalIndent = 5; + link.setLayoutData(gridData); + link.addSelectionListener(new SelectionAdapter() { + public void widgetSelected(SelectionEvent e) { + Program.launch("http://labs.jboss.com/jbossjbpm/downloads/"); + } + }); + } + + private void createLocateJbpmRuntimeGroup(Composite composite) { + Group group = new Group(composite, SWT.NONE); + group.setText("Locate a JBoss jBPM Runtime"); + group.setLayout(new GridLayout(3, false)); + GridData gridData = new GridData(GridData.FILL_HORIZONTAL); + gridData.verticalIndent = 5; + group.setLayoutData(gridData); + createJbpmRuntimeNameField(group); + createJbpmRuntimeLocationField(group); + createJbpmRuntimeVersionField(group); + } + + private void createJbpmRuntimeVersionField(Composite composite) { + Label versionLabel = new Label(composite, SWT.NONE); + versionLabel.setText("Version :"); + versionText = new Text(composite, SWT.BORDER); + versionText.setEditable(false); + versionText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + } + + private void createJbpmRuntimeNameField(Composite composite) { + Label nameLabel = new Label(composite, SWT.NONE); + nameLabel.setText("Name :"); + nameText = new Text(composite, SWT.BORDER); + nameText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + nameText.addModifyListener(new ModifyListener() { + public void modifyText(ModifyEvent e) { + update(); + } + }); + new Label(composite, SWT.NONE); + } + + private void createJbpmRuntimeLocationField(Composite composite) { + Label locationLabel = new Label(composite, SWT.NONE); + locationLabel.setText("Location :"); + locationText = new Text(composite, SWT.BORDER); + locationText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + locationText.addModifyListener(new ModifyListener() { + public void modifyText(ModifyEvent e) { + update(); + } + }); + Button locationButton = new Button(composite, SWT.PUSH); + locationButton.setText("Browse..."); + locationButton.addSelectionListener(new SelectionAdapter() { + public void widgetSelected(SelectionEvent e) { + searchLocation(); + } + }); + } + + private void searchLocation() { + DirectoryDialog dialog = new DirectoryDialog(getShell(), SWT.OPEN); + String result = dialog.open(); + if (result != null) { + locationText.setText(result); + } + } + + private Composite createClientArea(Composite parent) { + Composite composite= new Composite(parent, SWT.NONE); + GridLayout layout= new GridLayout(); + layout.marginWidth= 0; + layout.marginHeight= 0; + layout.numColumns= 1; + composite.setLayout(layout); + return composite; + } + + private void updateMessage() { + setErrorMessage(null); + if (isNameEmpty() && isLocationEmpty()) { + setMessage(ENTER_NAME_MSG); + } else if (isLocationEmpty()) { + setMessage(ENTER_LOCATION_MSG); + } else if (!isLocationExisting()) { + setErrorMessage(UNEXISTING_LOCATION_MSG); + } else if (!isValidJbpmInstallation()) { + setErrorMessage(INVALID_LOCATION_MSG); + } else if (isNameEmpty()) { + setMessage(ENTER_NAME_MSG); + } else { + setMessage(CONTINUE_MSG); + } + } + + private void updateVersion() { + String version = getVersion(); + if (version != null) { + versionText.setText(version); + } + } + + private String getVersion() { + String result = null; +// File versionInfoFile; +// if (!isLocationEmpty() && isLocationExisting() && isValidJbpmInstallation()) { +// versionInfoFile = getJbpmVersionInfoFile(); +// if (versionInfoFile == null) return result; +// try { +// Document document = new SAXReader().read(versionInfoFile); +// result = document.getRootElement().attribute("name").getValue(); +// } +// catch (DocumentException e) {} +// catch (MalformedURLException e) {} +// } + return result; + } + + private boolean isNameEmpty() { + String text = nameText.getText(); + return text == null || "".equals(text); + } + + private boolean isLocationEmpty() { + String text = locationText.getText(); + return text == null || "".equals(text); + } + + private boolean isVersionEmpty() { + String text = versionText.getText(); + return text == null || "".equals(text); + } + + private boolean isLocationExisting() { + return new Path(locationText.getText()).toFile().exists(); + } + + private boolean isValidJbpmInstallation() { + return getJbpmVersionInfoFile().exists(); + } + + private File getJbpmVersionInfoFile() { + return new Path(locationText.getText()).append("/src/resources/gpd/version.info.xml").toFile(); + } + + +} Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wizard/ConfigureJpdl4RuntimePage.java ___________________________________________________________________ Name: svn:mime-type + text/plain

16 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r16813 - in trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe: messages and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: yradtsevich Date: 2009-07-27 04:28:18 -0400 (Mon, 27 Jul 2009) New Revision: 16813 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/selbar/SelectionBar.java Log: issue JBIDE-4029: Make selection bar scrollable for tags and their parents https://jira.jboss.org/jira/browse/JBIDE-4029 - added a drop down menu to show invisible tags Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2009-07-27 08:01:32 UTC (rev 16812) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2009-07-27 08:28:18 UTC (rev 16813) @@ -2515,7 +2515,7 @@ */ public void selectionChanged(SelectionChangedEvent event) { if (selectionBar != null) - selectionBar.selectionChanged(); + selectionBar.updateNodes(); // FIX for JBIDE-2114 if (!isVisualEditorVisible()) { // selection event doesn't changes a content Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java 2009-07-27 08:01:32 UTC (rev 16812) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java 2009-07-27 08:28:18 UTC (rev 16813) @@ -82,6 +82,7 @@ public static String MenuCreationHelper_Cut; public static String MenuCreationHelper_Paste; public static String MenuCreationHelper_Test; + public static String SelectionBar_MoreNodes; public static String TemplatesPreferencePage_Edit; public static String TemplatesPreferencePage_Remove; public static String TemplatesTableProvider_Children; Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2009-07-27 08:01:32 UTC (rev 16812) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2009-07-27 08:28:18 UTC (rev 16813) @@ -61,6 +61,7 @@ MenuCreationHelper_Cut=Cut MenuCreationHelper_Paste=Paste MenuCreationHelper_Test=Test +SelectionBar_MoreNodes=More Nodes... TemplatesPreferencePage_Edit=Edit TemplatesPreferencePage_Remove=Remove TemplatesTableProvider_Children=Children Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/selbar/SelectionBar.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/selbar/SelectionBar.java 2009-07-27 08:01:32 UTC (rev 16812) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/selbar/SelectionBar.java 2009-07-27 08:28:18 UTC (rev 16813) @@ -17,17 +17,21 @@ import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.MessageDialogWithToggle; import org.eclipse.swt.SWT; -import org.eclipse.swt.SWTException; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.graphics.Point; import org.eclipse.swt.graphics.Rectangle; +import org.eclipse.swt.layout.FormAttachment; +import org.eclipse.swt.layout.FormData; +import org.eclipse.swt.layout.FormLayout; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Event; -import org.eclipse.swt.widgets.Layout; import org.eclipse.swt.widgets.Listener; +import org.eclipse.swt.widgets.Menu; +import org.eclipse.swt.widgets.MenuItem; import org.eclipse.swt.widgets.ToolBar; import org.eclipse.swt.widgets.ToolItem; import org.eclipse.ui.ISharedImages; @@ -40,7 +44,6 @@ import org.jboss.tools.common.model.ui.attribute.adapter.IModelPropertyEditorAdapter; import org.jboss.tools.common.model.ui.util.ModelUtilities; import org.jboss.tools.jst.jsp.preferences.VpePreference; -import org.jboss.tools.vpe.VpePlugin; import org.jboss.tools.vpe.editor.VpeController; import org.jboss.tools.vpe.editor.selection.VpeSourceSelection; import org.jboss.tools.vpe.editor.selection.VpeSourceSelectionBuilder; @@ -56,9 +59,11 @@ * @author erick */ -public class SelectionBar extends Layout implements SelectionListener { +public class SelectionBar implements SelectionListener { private Splitter splitter; + private boolean resizeListenerAdded = false; + private VpeController vpeController = null; private ToolBar selBar = null; @@ -68,7 +73,6 @@ private Composite cmpToolBar = null; private Composite cmpTlEmpty = null; - private Composite cmpBar = null; private Composite closeBar = null; private List<VisibilityListener> visibilityListeners = new ArrayList<VisibilityListener>(1); @@ -78,6 +82,13 @@ */ private boolean visible; + private ToolItem dropDownItem; + + private Button arrowButton; + + private Menu dropDownMenu; + + //Listener selbarListener = null; final static String PREFERENCE_YES = "yes"; //$NON-NLS-1$ @@ -101,7 +112,7 @@ // Main composite of the visible splitter cmpToolBar = new Composite(splitter, SWT.NONE); - cmpToolBar.setLayout(this); + cmpToolBar.setLayout(new FormLayout()); GridLayout layoutTl = new GridLayout(1, false); layoutTl.marginBottom = 0; @@ -110,13 +121,12 @@ layoutTl.verticalSpacing = 0; layoutTl.horizontalSpacing = 0; - // Middle composite, witch contain the selectbar - cmpBar = new Composite(cmpToolBar, SWT.NONE); - cmpBar.setLayout(layoutTl); - cmpBar.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); closeBar = new Composite(cmpToolBar, SWT.NONE); + FormData closeBarData = new FormData(); + closeBarData.right = new FormAttachment(100); + closeBarData.top = new FormAttachment(0); closeBar.setLayout(layoutTl); - closeBar.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + closeBar.setLayoutData(closeBarData); closeSelectionBar = new ToolBar(closeBar, SWT.HORIZONTAL | SWT.FLAT); ToolItem closeItem = new ToolItem(closeSelectionBar, SWT.FLAT); @@ -149,7 +159,12 @@ }); // Create selection bar - selBar = new ToolBar(cmpBar, SWT.HORIZONTAL | SWT.FLAT); + selBar = new ToolBar(cmpToolBar, SWT.HORIZONTAL | SWT.FLAT); + FormData selBarData = new FormData(SWT.DEFAULT, SWT.DEFAULT); + selBarData.left = new FormAttachment(0); + selBarData.right = new FormAttachment(closeBar, 0, SWT.LEFT); + selBarData.top = new FormAttachment(0); + selBar.setLayoutData(selBarData); setVisible(visible); return splitter; @@ -274,7 +289,7 @@ this.vpeController = vpeController; } - public void selectionChanged() { + public void updateNodes() { VpeSourceSelectionBuilder sourceSelectionBuilder = new VpeSourceSelectionBuilder( vpeController.getSourceEditor()); VpeSourceSelection selection = sourceSelectionBuilder.getSelection(); @@ -289,22 +304,18 @@ } removeNodeListenerFromAllNodes(); + cleanToolBar(selBar); + int elementCounter = 0; while (node != null && (node.getNodeType() == Node.ELEMENT_NODE || node.getNodeType() == Node.COMMENT_NODE)) { addNodeListenerTo(node); - ToolItem item = null; - if (selBar.getItemCount() > elementCounter) { - item = selBar.getItem(selBar.getItemCount() - 1 - elementCounter); - item.setData(node); - } else { - item = new ToolItem(selBar, SWT.FLAT, 0); - item.addSelectionListener(this); - item.setData(node); - } + ToolItem item = new ToolItem(selBar, SWT.FLAT, 0); + item.addSelectionListener(this); + item.setData(node); + item.setText(node.getNodeName()); - item.setText(node.getNodeName()); elementCounter++; node = node.getParentNode(); } @@ -316,10 +327,98 @@ cmpToolBar.layout(); // bug was fixed when toolbar are not shown for resizeble components cmpToolBar.layout(); - splitter.getParent().layout(true,true); + splitter.getParent().layout(true, true); + + deleteArrow(); + addArrowIfNecessary(); + + if (!resizeListenerAdded ) { + selBar.addListener(SWT.Resize, new Listener() { + public void handleEvent(Event event) { + updateNodes(); + } + }); + resizeListenerAdded = true; + } } /** + * Deletes all items from {@code #toolBar}. + */ + private void cleanToolBar(ToolBar toolBar) { + ToolItem[] oldItems = toolBar.getItems(); + for (ToolItem oldItem : oldItems) { + oldItem.dispose(); + } + } + + /** + * Deletes the {@link #arrowButton} with drop-down menu if it is existing. + */ + private void deleteArrow() { + if (dropDownMenu != null) { + dropDownMenu.dispose(); + dropDownMenu = null; + } + if (dropDownItem != null) { + dropDownItem.dispose(); + dropDownItem = null; + } + if (arrowButton != null) { + arrowButton.dispose(); + arrowButton = null; + } + } + + /** + * Adds {@link #arrowButton} with drop-down menu if there are + * invisible items in the {@link #selBar}. + * <P> + * It is assumed that the arrow is not existing at the entry point. + */ + private void addArrowIfNecessary() { + ToolItem[] items = selBar.getItems(); + + if (items.length == 0 || isItemShown(items[items.length - 1])) { + // the arrow is not necessary + return; + } + + dropDownItem = new ToolItem(selBar, SWT.SEPARATOR, 0); + arrowButton = new Button(selBar, SWT.ARROW | SWT.DOWN); + arrowButton.setToolTipText(VpeUIMessages.SelectionBar_MoreNodes); + arrowButton.pack(); + dropDownItem.setWidth(arrowButton.getSize().x); + dropDownItem.setControl(arrowButton); + dropDownMenu = new Menu(selBar); + for (int i = 0; i < items.length + && !isItemShown(items[items.length - 1]); i++) { + MenuItem menuItem = new MenuItem(dropDownMenu, SWT.PUSH); + menuItem.setText(items[i].getText()); + menuItem.setData(items[i].getData()); + menuItem.addSelectionListener(this); + items[i].dispose(); + } + arrowButton.addListener(SWT.Selection, new Listener() { + public void handleEvent(Event event) { + Rectangle bounds = dropDownItem.getBounds(); + Point point = selBar.toDisplay(bounds.x, bounds.y + + bounds.height); + dropDownMenu.setLocation(point); + dropDownMenu.setVisible(true); + } + }); + } + + private boolean isItemShown(ToolItem toolItem) { + ToolBar toolBar = toolItem.getParent(); + Rectangle toolItemBounds = toolItem.getBounds(); + Rectangle intersection = toolBar.getBounds().intersection( + toolItemBounds); + return intersection.equals(toolItemBounds); + } + + /** * List of nodes that are notifying {@link #nodeListener} when they are * changed. */ @@ -353,57 +452,6 @@ nodeNotifiers.clear(); } - protected Point computeSize(Composite composite, int wHint, int hHint, boolean flushCache) { - Point point = selBar.computeSize(SWT.DEFAULT, hHint); - point.y = closeBar.getSize().y; - return point; - } - - protected void layout(Composite composite, boolean flushCache) { - Rectangle rect = null; - try { - rect = composite.getBounds(); - } catch (SWTException e) { - VpePlugin.getPluginLog().logError(e); - } - - Rectangle closeBarRect = closeSelectionBar.getItem(0).getBounds(); - rect.width -= closeBarRect.width; - - int allItems = selBar.getItems().length; - if (allItems == 0) { - cmpBar.setBounds(new Rectangle(rect.x, rect.y, rect.width, - closeBarRect.height)); - closeBar.setBounds(new Rectangle(rect.width, rect.y, rect.width - + closeBarRect.width, closeBarRect.height)); - return; - } - Rectangle r = selBar.getItem(allItems - 1).getBounds(); - int width = r.x + r.width ; - int height = r.height; - - if (allItems >= itemCount) { - int x = 0; - - if (itemCount == 0) { - x = selBar.getBounds().width; - } else { - x = selBar.getItem(allItems - itemCount).getBounds().x; - } - - rect.x -= x; - - if (rect.width < (r.x + r.width - Math.abs(rect.x) + 10)) { - rect.x -= (r.x + r.width - Math.abs(rect.x)) - rect.width; - } - - cmpBar.setBounds(new Rectangle(rect.x, 0, width, height)); - selBar.setSize(width, closeBarRect.height); - closeBar.setBounds(new Rectangle(rect.width, rect.y, rect.width - + closeBarRect.width, closeBarRect.height)); - } - } - public void dispose() { removeNodeListenerFromAllNodes(); @@ -432,10 +480,8 @@ } public void widgetSelected(SelectionEvent e) { - ToolItem toolItem = (ToolItem) e.widget; - - SelectionUtil.setSourceSelection(vpeController.getPageContext(), - (Node) toolItem.getData()); + SelectionUtil.setSourceSelection(vpeController.getPageContext(), + (Node) e.widget.getData()); } public void widgetDefaultSelected(SelectionEvent e) { @@ -478,7 +524,6 @@ StringBuffer st = new StringBuffer("CountItem: "); //$NON-NLS-1$ st.append(itemCount); st.append(" Parent Composite: " + cmpToolBar.getBounds().width); //$NON-NLS-1$ - st.append(" Midle composite: " + cmpBar.getBounds().width); //$NON-NLS-1$ st.append(" Bar : " + selBar.getBounds().width); //$NON-NLS-1$ return st.toString(); } @@ -486,7 +531,7 @@ /** * Listener for nodes that are implementing {@link INodeAdapter}. - * Calls {@link SelectionBar#selectionChanged()} every time when these nodes are changed. + * Calls {@link SelectionBar#updateNodes()} every time when these nodes are changed. * <P> * This class is a part of fix of JBIDE-3919: * Incorrect interaction of block comments with selection bar. @@ -518,6 +563,6 @@ * event' instance. */ public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) { - selectionBar.selectionChanged(); + selectionBar.updateNodes(); } }

16 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r16812 - in trunk: jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template and 4 other directories.

by jbosstools-commits＠lists.jboss.org

Author: sflanigan Date: 2009-07-27 04:01:32 -0400 (Mon, 27 Jul 2009) New Revision: 16812 Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/Messages.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/messages.properties Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/RichFacesTemplatesActivator.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/AbstractRichFacesTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesColumnGroupTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataDefinitionListTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesEditorTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesInplaceSelectTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesOrderingList.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPickListTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesProgressBarTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesSeparatorTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesToggleControlTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTogglePanelTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesVirtualEarthTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/seam/test/unit/SeamTextTest.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/seam/text/xpl/SeamTextLexer.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/seam/text/xpl/SeamTextParser.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/SeamTemplatesActivator.java trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/el/AbstractELCompletionEngine.java Log: https://jira.jboss.org/jira/browse/JBIDE-3557 Externalize English strings Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/Messages.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/Messages.java (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/Messages.java 2009-07-27 08:01:32 UTC (rev 16812) @@ -0,0 +1,18 @@ +package org.jboss.tools.jsf.vpe.richfaces; + +import org.eclipse.osgi.util.NLS; + +public class Messages extends NLS { + private static final String BUNDLE_NAME = "org.jboss.tools.jsf.vpe.richfaces.messages"; //$NON-NLS-1$ + public static String RichFacesOrderingList_DownLabel; + public static String RichFacesOrderingList_FirstLabel; + public static String RichFacesOrderingList_LastLabel; + public static String RichFacesOrderingList_UpLabel; + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + private Messages() { + } +} Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/RichFacesTemplatesActivator.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/RichFacesTemplatesActivator.java 2009-07-27 07:43:39 UTC (rev 16811) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/RichFacesTemplatesActivator.java 2009-07-27 08:01:32 UTC (rev 16812) @@ -26,7 +26,7 @@ public class RichFacesTemplatesActivator extends BaseUIPlugin { // The plug-in ID - public static final String PLUGIN_ID = "org.jboss.tools.jsf.vpe.richfaces"; + public static final String PLUGIN_ID = "org.jboss.tools.jsf.vpe.richfaces"; //$NON-NLS-1$ // The shared instance private static RichFacesTemplatesActivator plugin; @@ -68,9 +68,9 @@ Bundle bundle = Platform.getBundle(PLUGIN_ID); URL url = null; try { - url = bundle == null ? null : FileLocator.resolve(bundle.getEntry("/resources")); + url = bundle == null ? null : FileLocator.resolve(bundle.getEntry("/resources")); //$NON-NLS-1$ } catch (IOException e) { - url = bundle.getEntry("/resources"); + url = bundle.getEntry("/resources"); //$NON-NLS-1$ } return (url == null) ? null : url.getPath(); } Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/messages.properties =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/messages.properties (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/messages.properties 2009-07-27 08:01:32 UTC (rev 16812) @@ -0,0 +1,4 @@ +RichFacesOrderingList_DownLabel=Down +RichFacesOrderingList_FirstLabel=First +RichFacesOrderingList_LastLabel=Last +RichFacesOrderingList_UpLabel=Up Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/AbstractRichFacesTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/AbstractRichFacesTemplate.java 2009-07-27 07:43:39 UTC (rev 16811) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/AbstractRichFacesTemplate.java 2009-07-27 08:01:32 UTC (rev 16812) @@ -39,7 +39,7 @@ * @return value of attribute */ public String getAttribute(String nameAttr, Node sourceNode) { - String returnValue = ""; + String returnValue = ""; //$NON-NLS-1$ NamedNodeMap sourceAttrbutes = sourceNode.getAttributes(); for (int i = 0; i < sourceAttrbutes.getLength(); i++) { @@ -61,7 +61,7 @@ */ public boolean isEmptyAttribute(String nameAttr, Node sourceNode) { - return getAttribute(nameAttr, sourceNode).equalsIgnoreCase(""); + return getAttribute(nameAttr, sourceNode).equalsIgnoreCase(""); //$NON-NLS-1$ } @@ -73,17 +73,17 @@ * @return the string */ public String parseStyle(Node sourceNode) { - String style = getAttribute("style", sourceNode); - String str=""; - StringTokenizer st = new StringTokenizer(style,";:"); + String style = getAttribute("style", sourceNode); //$NON-NLS-1$ + String str=""; //$NON-NLS-1$ + StringTokenizer st = new StringTokenizer(style,";:"); //$NON-NLS-1$ while(st.hasMoreTokens()) { String token = st.nextToken(); - if(token.trim().equalsIgnoreCase("width") || token.trim().equalsIgnoreCase("height")) { + if(token.trim().equalsIgnoreCase("width") || token.trim().equalsIgnoreCase("height")) { //$NON-NLS-1$ //$NON-NLS-2$ st.nextToken(); continue; } - str+=token + ":" + st.nextToken() + "; "; + str+=token + ":" + st.nextToken() + "; "; //$NON-NLS-1$ //$NON-NLS-2$ } return str; @@ -98,13 +98,13 @@ */ public String parseStyleWidth(Node sourceNode) { - String style = getAttribute("style", sourceNode); - String widthValue = ""; - StringTokenizer st = new StringTokenizer(style, ":;"); + String style = getAttribute("style", sourceNode); //$NON-NLS-1$ + String widthValue = ""; //$NON-NLS-1$ + StringTokenizer st = new StringTokenizer(style, ":;"); //$NON-NLS-1$ while (st.hasMoreTokens()) { String str = st.nextToken(); - if (str.trim().equalsIgnoreCase("width")) { + if (str.trim().equalsIgnoreCase("width")) { //$NON-NLS-1$ widthValue = st.nextToken(); } } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesColumnGroupTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesColumnGroupTemplate.java 2009-07-27 07:43:39 UTC (rev 16811) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesColumnGroupTemplate.java 2009-07-27 08:01:32 UTC (rev 16812) @@ -44,22 +44,22 @@ @Override protected String getHeaderClass() { - return "dr-table-header rich-table-header"; + return "dr-table-header rich-table-header"; //$NON-NLS-1$ } @Override protected String getHeaderContinueClass() { - return "dr-table-header-continue rich-table-header-continue"; + return "dr-table-header-continue rich-table-header-continue"; //$NON-NLS-1$ } @Override protected String getFooterClass() { - return "dr-table-footer rich-table-footer"; + return "dr-table-footer rich-table-footer"; //$NON-NLS-1$ } @Override protected String getFooterContinueClass() { - return "dr-table-footer-continue rich-table-footer-continue"; + return "dr-table-footer-continue rich-table-footer-continue"; //$NON-NLS-1$ } @Override Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataDefinitionListTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataDefinitionListTemplate.java 2009-07-27 07:43:39 UTC (rev 16811) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataDefinitionListTemplate.java 2009-07-27 08:01:32 UTC (rev 16812) @@ -41,10 +41,10 @@ * */ private static final String DEFAULT_DD_CLASS = "columnClass"; //$NON-NLS-1$ - private static final String FACET_URI = "http://java.sun.com/jsf/core"; - private static final String FACET_NAME_ATTR = "name"; - private static final String FACET_NAME_ATTR_VALUE = "term"; - private static final String STYLE_RESOURCES_PATH = "/dataDefinitionList/dataDefinitionList.css"; + private static final String FACET_URI = "http://java.sun.com/jsf/core"; //$NON-NLS-1$ + private static final String FACET_NAME_ATTR = "name"; //$NON-NLS-1$ + private static final String FACET_NAME_ATTR_VALUE = "term"; //$NON-NLS-1$ + private static final String STYLE_RESOURCES_PATH = "/dataDefinitionList/dataDefinitionList.css"; //$NON-NLS-1$ /** * Creates a node of the visual tree on the node of the source tree. This @@ -64,7 +64,7 @@ ComponentUtil.setCSSLink( pageContext, STYLE_RESOURCES_PATH, - "dataDefinitionList"); + "dataDefinitionList"); //$NON-NLS-1$ VpeCreationData creationData = new VpeCreationData(listElement); creationData.addChildrenInfo(new VpeChildrenInfo(null)); @@ -77,7 +77,7 @@ RichFaces.ATTR_STYLE, HTML.ATTR_STYLE, null, null); ComponentUtil.correctAttribute((Element)sourceNode, listElement, - RichFaces.ATTR_STYLE_CLASS, HTML.ATTR_CLASS, null, "listClass"); + RichFaces.ATTR_STYLE_CLASS, HTML.ATTR_CLASS, null, "listClass"); //$NON-NLS-1$ Element facetElement = null; List<Element> dataDefinitionElements = new ArrayList<Element>(); @@ -185,7 +185,7 @@ RichFaces.ATTR_HEADER_CLASS, HTML.ATTR_CLASS, null, - "headerClass"); + "headerClass"); //$NON-NLS-1$ parentList.appendChild(dt); VpeChildrenInfo child = new VpeChildrenInfo(dt); child.addSourceChild(facetElement); Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesEditorTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesEditorTemplate.java 2009-07-27 07:43:39 UTC (rev 16811) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesEditorTemplate.java 2009-07-27 08:01:32 UTC (rev 16812) @@ -156,8 +156,8 @@ } nsIDOMElement outerTD = visualDocument.createElement(HTML.TAG_TD); nsIDOMElement div = visualDocument.createElement(HTML.TAG_DIV); { - div.setAttribute(HTML.ATTR_CLASS, "mceIframeContainer"); - div.setAttribute(HTML.ATTR_STYLE, "height: 100%;"); + div.setAttribute(HTML.ATTR_CLASS, "mceIframeContainer"); //$NON-NLS-1$ + div.setAttribute(HTML.ATTR_STYLE, "height: 100%;"); //$NON-NLS-1$ } nsIDOMElement table = visualDocument.createElement(HTML.TAG_TABLE); { table.setAttribute(HTML.ATTR_BORDER, "0"); //$NON-NLS-1$ Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesInplaceSelectTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesInplaceSelectTemplate.java 2009-07-27 07:43:39 UTC (rev 16811) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesInplaceSelectTemplate.java 2009-07-27 08:01:32 UTC (rev 16812) @@ -173,7 +173,7 @@ + Constants.WHITE_SPACE + HTML.ATTR_WIDTH + Constants.COLON +this.sourceListWidth + Constants.SEMICOLON; - System.out.println(" dropDownListSizesStyle = " + System.out.println(" dropDownListSizesStyle = " //$NON-NLS-1$ + dropDownListSizesStyle); table.setAttribute(HTML.ATTR_STYLE, dropDownListSizesStyle); Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesOrderingList.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesOrderingList.java 2009-07-27 07:43:39 UTC (rev 16811) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesOrderingList.java 2009-07-27 08:01:32 UTC (rev 16812) @@ -8,6 +8,7 @@ import org.jboss.tools.jsf.vpe.richfaces.ComponentUtil; import org.jboss.tools.jsf.vpe.richfaces.HtmlComponentUtil; +import org.jboss.tools.jsf.vpe.richfaces.Messages; import org.jboss.tools.jsf.vpe.richfaces.RichFacesTemplatesActivator; import org.jboss.tools.jsf.vpe.richfaces.template.util.RichFaces; import org.jboss.tools.vpe.editor.context.VpePageContext; @@ -30,97 +31,97 @@ private static final String COLUMN = ':' + RichFaces.TAG_COLUMN; private static final String COLUMNS = ':' + RichFaces.TAG_COLUMNS; - private static final String DEFAULT_LIST_HEIGHT = "150px"; - private static final String DEFAULT_LIST_WIDTH = "300px"; + private static final String DEFAULT_LIST_HEIGHT = "150px"; //$NON-NLS-1$ + private static final String DEFAULT_LIST_WIDTH = "300px"; //$NON-NLS-1$ - private static final String DEFAULT_HEIGHT = "200px"; - private static final String DEFAULT_WIDTH = "300px"; + private static final String DEFAULT_HEIGHT = "200px"; //$NON-NLS-1$ + private static final String DEFAULT_WIDTH = "300px"; //$NON-NLS-1$ - private static final String CAPTION_FACET = "caption"; - private static final String TOP_CONTROL_FACET = "topControl"; - private static final String UP_CONTROL_FACET = "upControl"; - private static final String DOWN_CONTROL_FACET = "downControl"; - private static final String BOTTOM_CONTROL_FACET = "bottomControl"; + private static final String CAPTION_FACET = "caption"; //$NON-NLS-1$ + private static final String TOP_CONTROL_FACET = "topControl"; //$NON-NLS-1$ + private static final String UP_CONTROL_FACET = "upControl"; //$NON-NLS-1$ + private static final String DOWN_CONTROL_FACET = "downControl"; //$NON-NLS-1$ + private static final String BOTTOM_CONTROL_FACET = "bottomControl"; //$NON-NLS-1$ - private static final String HEADER = "header"; - private static final String HEADER_CLASS = "headerClass"; - private static final String FOOTER = "footer"; - private static final String FOOTER_CLASS = "footerClass"; - private static final String CAPTION_CLASS = "captionClass"; - private static final String CAPTION_STYLE = "captionStyle"; - private static final String SPACE = " "; + private static final String HEADER = "header"; //$NON-NLS-1$ + private static final String HEADER_CLASS = "headerClass"; //$NON-NLS-1$ + private static final String FOOTER = "footer"; //$NON-NLS-1$ + private static final String FOOTER_CLASS = "footerClass"; //$NON-NLS-1$ + private static final String CAPTION_CLASS = "captionClass"; //$NON-NLS-1$ + private static final String CAPTION_STYLE = "captionStyle"; //$NON-NLS-1$ + private static final String SPACE = " "; //$NON-NLS-1$ - private static final String STYLE_FOR_LOW_SCROLL = "overflow: scroll; width: 100%; height: 17px;"; - private static final String STYLE_FOR_RIGHT_SCROLL = "overflow: scroll; width: 17px; height: 100%;"; + private static final String STYLE_FOR_LOW_SCROLL = "overflow: scroll; width: 100%; height: 17px;"; //$NON-NLS-1$ + private static final String STYLE_FOR_RIGHT_SCROLL = "overflow: scroll; width: 17px; height: 100%;"; //$NON-NLS-1$ private static final int NUM_ROW = 1; - private static final String TOP_CONTROL_IMG = "orderingList/top.gif"; - private static final String UP_CONTROL_IMG = "orderingList/up.gif"; - private static final String DOWN_CONTROL_IMG = "orderingList/down.gif"; - private static final String BOTTOM_CONTROL_IMG = "orderingList/bottom.gif"; + private static final String TOP_CONTROL_IMG = "orderingList/top.gif"; //$NON-NLS-1$ + private static final String UP_CONTROL_IMG = "orderingList/up.gif"; //$NON-NLS-1$ + private static final String DOWN_CONTROL_IMG = "orderingList/down.gif"; //$NON-NLS-1$ + private static final String BOTTOM_CONTROL_IMG = "orderingList/bottom.gif"; //$NON-NLS-1$ - private static final String BUTTON_BG = "orderingList/button_bg.gif"; - private static final String HEADER_CELL_BG = "orderingList/table_header_cell_bg.gif"; + private static final String BUTTON_BG = "orderingList/button_bg.gif"; //$NON-NLS-1$ + private static final String HEADER_CELL_BG = "orderingList/table_header_cell_bg.gif"; //$NON-NLS-1$ - private static final String WIDTH = "width"; - private static final String HEIGHT = "height"; - private static final String LIST_WIDTH = "listWidth"; - private static final String LIST_HEIGHT = "listHeight"; + private static final String WIDTH = "width"; //$NON-NLS-1$ + private static final String HEIGHT = "height"; //$NON-NLS-1$ + private static final String LIST_WIDTH = "listWidth"; //$NON-NLS-1$ + private static final String LIST_HEIGHT = "listHeight"; //$NON-NLS-1$ - private static final String TOP_CONTROL_LABEL = "topControlLabel"; - private static final String UP_CONTROL_LABEL = "upControlLabel"; - private static final String DOWN_CONTROL_LABEL = "downControlLabel"; - private static final String BOTTOM_CONTROL_LABEL = "bottomControlLabel"; + private static final String TOP_CONTROL_LABEL = "topControlLabel"; //$NON-NLS-1$ + private static final String UP_CONTROL_LABEL = "upControlLabel"; //$NON-NLS-1$ + private static final String DOWN_CONTROL_LABEL = "downControlLabel"; //$NON-NLS-1$ + private static final String BOTTOM_CONTROL_LABEL = "bottomControlLabel"; //$NON-NLS-1$ - private static final String TOP_CONTROL_LABEL_DEFAULT = "First"; - private static final String UP_CONTROL_LABEL_DEFAULT = "Up"; - private static final String DOWN_CONTROL_LABEL_DEFAULT = "Down"; - private static final String BOTTOM_CONTROL_LABEL_DEFAULT = "Last"; + private static final String TOP_CONTROL_LABEL_DEFAULT = Messages.RichFacesOrderingList_FirstLabel; + private static final String UP_CONTROL_LABEL_DEFAULT = Messages.RichFacesOrderingList_UpLabel; + private static final String DOWN_CONTROL_LABEL_DEFAULT = Messages.RichFacesOrderingList_DownLabel; + private static final String BOTTOM_CONTROL_LABEL_DEFAULT = Messages.RichFacesOrderingList_LastLabel; - private static final String CAPTION_LABEL = "captionLabel"; + private static final String CAPTION_LABEL = "captionLabel"; //$NON-NLS-1$ - private static final String CONTROLS_TYPE = "controlsType"; - private static final String CONTROLS_VERTICAL_ALIGN = "controlsVerticalAlign"; - private static final String CONTROLS_HORIZONTAL_ALIGN = "controlsHorizontalAlign"; - private static final String SHOW_BUTTON_LABELS = "showButtonLabels"; - private static final String FAST_ORDER_CONTROL_VISIBLE = "fastOrderControlsVisible"; - private static final String ORDER_CONTROL_VISIBLE = "orderControlsVisible"; + private static final String CONTROLS_TYPE = "controlsType"; //$NON-NLS-1$ + private static final String CONTROLS_VERTICAL_ALIGN = "controlsVerticalAlign"; //$NON-NLS-1$ + private static final String CONTROLS_HORIZONTAL_ALIGN = "controlsHorizontalAlign"; //$NON-NLS-1$ + private static final String SHOW_BUTTON_LABELS = "showButtonLabels"; //$NON-NLS-1$ + private static final String FAST_ORDER_CONTROL_VISIBLE = "fastOrderControlsVisible"; //$NON-NLS-1$ + private static final String ORDER_CONTROL_VISIBLE = "orderControlsVisible"; //$NON-NLS-1$ - private static final String LIST_CLASS = "listClass"; - private static final String CONTROLS_CLASS = "controlsClass"; - private static final String TOP_CONTROL_CLASS = "topControlClass"; - private static final String UP_CONTROL_CLASS = "upControlClass"; - private static final String DOWN_CONTROL_CLASS = "downControlClass"; - private static final String BOTTOM_CONTROL_CLASS = "bottomControlClass"; - private static final String ROW_CLASSES = "rowClasses"; + private static final String LIST_CLASS = "listClass"; //$NON-NLS-1$ + private static final String CONTROLS_CLASS = "controlsClass"; //$NON-NLS-1$ + private static final String TOP_CONTROL_CLASS = "topControlClass"; //$NON-NLS-1$ + private static final String UP_CONTROL_CLASS = "upControlClass"; //$NON-NLS-1$ + private static final String DOWN_CONTROL_CLASS = "downControlClass"; //$NON-NLS-1$ + private static final String BOTTOM_CONTROL_CLASS = "bottomControlClass"; //$NON-NLS-1$ + private static final String ROW_CLASSES = "rowClasses"; //$NON-NLS-1$ - private static final String CSS_CAPTION_CLASS = "rich-ordering-list-caption"; + private static final String CSS_CAPTION_CLASS = "rich-ordering-list-caption"; //$NON-NLS-1$ - private static final String CSS_CONTROLS_CLASS = "rich-ordering-controls"; - private static final String CSS_TOP_CONTROL_CLASS = "rich-ordering-control-top"; - private static final String CSS_BUTTON_LAYOUT_CLASS = "rich-ordering-list-button-layout"; - private static final String CSS_UP_CONTROL_CLASS = "rich-ordering-control-up"; - private static final String CSS_DOWN_CONTROL_CLASS = "rich-ordering-control-down"; - private static final String CSS_BOTTOM_CONTROL_CLASS = "rich-ordering-control-bottom"; - private static final String CSS_BUTTON_CLASS = "rich-ordering-list-button"; - private static final String CSS_BUTTON_SELECTION_CLASS = "rich-ordering-list-button-selection"; - private static final String CSS_BUTTON_CONTENT_CLASS = "rich-ordering-list-button-content"; - private static final String CSS_BUTTON_VALIGN_CLASS = "rich-ordering-list-button-valign"; + private static final String CSS_CONTROLS_CLASS = "rich-ordering-controls"; //$NON-NLS-1$ + private static final String CSS_TOP_CONTROL_CLASS = "rich-ordering-control-top"; //$NON-NLS-1$ + private static final String CSS_BUTTON_LAYOUT_CLASS = "rich-ordering-list-button-layout"; //$NON-NLS-1$ + private static final String CSS_UP_CONTROL_CLASS = "rich-ordering-control-up"; //$NON-NLS-1$ + private static final String CSS_DOWN_CONTROL_CLASS = "rich-ordering-control-down"; //$NON-NLS-1$ + private static final String CSS_BOTTOM_CONTROL_CLASS = "rich-ordering-control-bottom"; //$NON-NLS-1$ + private static final String CSS_BUTTON_CLASS = "rich-ordering-list-button"; //$NON-NLS-1$ + private static final String CSS_BUTTON_SELECTION_CLASS = "rich-ordering-list-button-selection"; //$NON-NLS-1$ + private static final String CSS_BUTTON_CONTENT_CLASS = "rich-ordering-list-button-content"; //$NON-NLS-1$ + private static final String CSS_BUTTON_VALIGN_CLASS = "rich-ordering-list-button-valign"; //$NON-NLS-1$ - private static final String CSS_HEADER_CLASS = "rich-ordering-list-header"; - private static final String CSS_TABLE_HEADER_CLASS = "rich-ordering-list-table-header"; - private static final String CSS_TABLE_HEADER_CELL_CLASS = "rich-ordering-list-table-header-cell"; - private static final String CSS_FOOTER_CLASS = "rich-ordering-list-footer"; - private static final String CSS_TABLE_FOOTER_CLASS = "rich-ordering-list-table-footer"; - private static final String CSS_TABLE_FOOTER_CELL_CLASS = "rich-ordering-list-table-footer-cell"; + private static final String CSS_HEADER_CLASS = "rich-ordering-list-header"; //$NON-NLS-1$ + private static final String CSS_TABLE_HEADER_CLASS = "rich-ordering-list-table-header"; //$NON-NLS-1$ + private static final String CSS_TABLE_HEADER_CELL_CLASS = "rich-ordering-list-table-header-cell"; //$NON-NLS-1$ + private static final String CSS_FOOTER_CLASS = "rich-ordering-list-footer"; //$NON-NLS-1$ + private static final String CSS_TABLE_FOOTER_CLASS = "rich-ordering-list-table-footer"; //$NON-NLS-1$ + private static final String CSS_TABLE_FOOTER_CELL_CLASS = "rich-ordering-list-table-footer-cell"; //$NON-NLS-1$ - private static final String CSS_LIST_BODY_CLASS = "rich-ordering-list-body"; - private static final String CSS_LIST_OUTPUT_CLASS = "rich-ordering-list-output"; - private static final String CSS_LIST_CONTENT_CLASS = "rich-ordering-list-content"; - private static final String CSS_LIST_ITEMS_CLASS = "rich-ordering-list-items"; - private static final String CSS_LIST_ROW_CLASS = "rich-ordering-list-row"; - private static final String CSS_LIST_CELL_CLASS = "rich-ordering-list-cell"; + private static final String CSS_LIST_BODY_CLASS = "rich-ordering-list-body"; //$NON-NLS-1$ + private static final String CSS_LIST_OUTPUT_CLASS = "rich-ordering-list-output"; //$NON-NLS-1$ + private static final String CSS_LIST_CONTENT_CLASS = "rich-ordering-list-content"; //$NON-NLS-1$ + private static final String CSS_LIST_ITEMS_CLASS = "rich-ordering-list-items"; //$NON-NLS-1$ + private static final String CSS_LIST_ROW_CLASS = "rich-ordering-list-row"; //$NON-NLS-1$ + private static final String CSS_LIST_CELL_CLASS = "rich-ordering-list-cell"; //$NON-NLS-1$ /* * (non-Javadoc) @@ -145,8 +146,8 @@ // --------------------- COMMON TABLE ------------------------ - ComponentUtil.setCSSLink(pageContext, "orderingList/orderingList.css", - "richFacesOrderingList"); + ComponentUtil.setCSSLink(pageContext, "orderingList/orderingList.css", //$NON-NLS-1$ + "richFacesOrderingList"); //$NON-NLS-1$ nsIDOMElement tableCommon = visualDocument .createElement(HtmlComponentUtil.HTML_TAG_TABLE); @@ -168,13 +169,13 @@ .createElement(HtmlComponentUtil.HTML_TAG_DIV); captionRow_TD_DIV.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, CSS_CAPTION_CLASS); captionRow_TD_DIV.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, - "width: " + (listWidth == null ? DEFAULT_LIST_WIDTH : listWidth) + "px;" - +"height: " + (listHeight == null ? DEFAULT_LIST_WIDTH : listHeight) + "px;"); + "width: " + (listWidth == null ? DEFAULT_LIST_WIDTH : listWidth) + "px;" //$NON-NLS-1$ //$NON-NLS-2$ + +"height: " + (listHeight == null ? DEFAULT_LIST_WIDTH : listHeight) + "px;"); //$NON-NLS-1$ //$NON-NLS-2$ Element captionFacet = ComponentUtil.getFacet(sourceElement, CAPTION_FACET); if (null != captionFacet) { // Creating table caption with facet content - nsIDOMElement fecetDiv = encodeFacetsToDiv(pageContext, captionFacet, false, CSS_CAPTION_CLASS, "", creationData, visualDocument); + nsIDOMElement fecetDiv = encodeFacetsToDiv(pageContext, captionFacet, false, CSS_CAPTION_CLASS, "", creationData, visualDocument); //$NON-NLS-1$ captionRow_TD_DIV.appendChild(fecetDiv); } else { captionRow_TD_DIV.appendChild(visualDocument.createTextNode(captionLabel)); @@ -192,25 +193,25 @@ nsIDOMElement tableListTD; nsIDOMElement buttonsTD; - if ("left".equalsIgnoreCase(controlsHorizontalAlign)) { + if ("left".equalsIgnoreCase(controlsHorizontalAlign)) { //$NON-NLS-1$ buttonsTD = dataRow_leftTD; tableListTD = dataRow_rightTD; - buttonsTD.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, "width: 1%;"); + buttonsTD.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, "width: 1%;"); //$NON-NLS-1$ } else { tableListTD = dataRow_leftTD; buttonsTD = dataRow_rightTD; } // ---------------------buttons------------------------ - if (!"none".equalsIgnoreCase(controlsType)) { + if (!"none".equalsIgnoreCase(controlsType)) { //$NON-NLS-1$ nsIDOMElement controlsDiv = createControlsDiv(pageContext, creationData, visualDocument, sourceElement); buttonsTD.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, CSS_BUTTON_VALIGN_CLASS); - buttonsTD.setAttribute(HtmlComponentUtil.HTML_ALIGN_ATTR, "center"); + buttonsTD.setAttribute(HtmlComponentUtil.HTML_ALIGN_ATTR, "center"); //$NON-NLS-1$ - if ((null != controlsVerticalAlign) && ("".equals(controlsVerticalAlign))){ - buttonsTD.setAttribute(HtmlComponentUtil.HTML_ATTR_VALIGN, ("center" - .equalsIgnoreCase(controlsVerticalAlign) ? "middle" + if ((null != controlsVerticalAlign) && ("".equals(controlsVerticalAlign))){ //$NON-NLS-1$ + buttonsTD.setAttribute(HtmlComponentUtil.HTML_ATTR_VALIGN, ("center" //$NON-NLS-1$ + .equalsIgnoreCase(controlsVerticalAlign) ? "middle" //$NON-NLS-1$ : controlsVerticalAlign)); } @@ -250,7 +251,7 @@ nsIDOMElement tr2 = visualDocument .createElement(HtmlComponentUtil.HTML_TAG_TR); - listOutputDiv.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, "overflow:hidden;width:100%;"); + listOutputDiv.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, "overflow:hidden;width:100%;"); //$NON-NLS-1$ listTable.appendChild(tr1); listTable.appendChild(tr2); listOutputDiv.appendChild(listTable); @@ -324,7 +325,7 @@ nsIDOMElement buttonsDiv = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_DIV); buttonsDiv.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, - CSS_CONTROLS_CLASS + " " + controlsClass + " " + CSS_CONTROLS_CLASS + " " + controlsClass + " " //$NON-NLS-1$ //$NON-NLS-2$ + CSS_BUTTON_LAYOUT_CLASS); Element top_control_facet = ComponentUtil.getFacet(sourceElement, TOP_CONTROL_FACET); @@ -395,11 +396,11 @@ nsIDOMElement img = visualDocument .createElement(HtmlComponentUtil.HTML_TAG_IMG); - div1.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, "dr-buttons-border" + " " + cssStyleName + " " + customStyleClass); + div1.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, "dr-buttons-border" + " " + cssStyleName + " " + customStyleClass); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ div2.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, CSS_BUTTON_CLASS); String resourceFolder = RichFacesTemplatesActivator.getPluginResourcePath(); - String divStyle = "width: 100%;background-image: url(file://" + resourceFolder + BUTTON_BG + ");"; + String divStyle = "width: 100%;background-image: url(file://" + resourceFolder + BUTTON_BG + ");"; //$NON-NLS-1$ //$NON-NLS-2$ div2.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, divStyle); div1.appendChild(div2); @@ -415,8 +416,8 @@ a.appendChild(div3); // Creating button with image and label ComponentUtil.setImg(img, imgName); - img.setAttribute(HTML.ATTR_WIDTH, "15"); - img.setAttribute(HTML.ATTR_HEIGHT, "15"); + img.setAttribute(HTML.ATTR_WIDTH, "15"); //$NON-NLS-1$ + img.setAttribute(HTML.ATTR_HEIGHT, "15"); //$NON-NLS-1$ div3.appendChild(img); if (showButtonLabels) { div3.appendChild(visualDocument.createTextNode(btnName)); @@ -470,7 +471,7 @@ nsIDOMElement tr = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_TR); thead.appendChild(tr); String styleClass = ComponentUtil.encodeStyleClass(null, - CSS_HEADER_CLASS + " " + CSS_TABLE_HEADER_CLASS, null, + CSS_HEADER_CLASS + " " + CSS_TABLE_HEADER_CLASS, null, //$NON-NLS-1$ headerClass); if (styleClass != null) { tr.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, @@ -528,23 +529,23 @@ // following line commented by yradtsevich because the variable rowClasses was not used //String rowClasses = sourceElement.getAttribute(ROW_CLASSES); - String divStyle = HtmlComponentUtil.HTML_WIDTH_ATTR + " : " - + (listWidth == null ? DEFAULT_LIST_WIDTH : listWidth) + ";" - + HtmlComponentUtil.HTML_HEIGHT_ATTR + " : " - + (listHeight == null ? DEFAULT_LIST_HEIGHT : listHeight) + ";"; + String divStyle = HtmlComponentUtil.HTML_WIDTH_ATTR + " : " //$NON-NLS-1$ + + (listWidth == null ? DEFAULT_LIST_WIDTH : listWidth) + ";" //$NON-NLS-1$ + + HtmlComponentUtil.HTML_HEIGHT_ATTR + " : " //$NON-NLS-1$ + + (listHeight == null ? DEFAULT_LIST_HEIGHT : listHeight) + ";"; //$NON-NLS-1$ contentDiv.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, divStyle); contentDiv.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, - CSS_LIST_OUTPUT_CLASS + " " + CSS_LIST_CONTENT_CLASS); + CSS_LIST_OUTPUT_CLASS + " " + CSS_LIST_CONTENT_CLASS); //$NON-NLS-1$ contentTable.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, - CSS_LIST_ITEMS_CLASS + " " + (null == listClass ? "" : listClass)); + CSS_LIST_ITEMS_CLASS + " " + (null == listClass ? "" : listClass)); //$NON-NLS-1$ //$NON-NLS-2$ - contentTable.setAttribute(HtmlComponentUtil.HTML_CELLSPACING_ATTR, "1"); + contentTable.setAttribute(HtmlComponentUtil.HTML_CELLSPACING_ATTR, "1"); //$NON-NLS-1$ VisualDomUtil.copyAttributes(sourceElement, contentTable); contentTable.removeAttribute(HtmlComponentUtil.HTML_ATR_HEIGHT); - contentTable.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, "width: 100%;"); + contentTable.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, "width: 100%;"); //$NON-NLS-1$ // ---------- FINALIZING and children encoding ----------- contentTable.appendChild(thead); @@ -584,8 +585,8 @@ .createElement(HtmlComponentUtil.HTML_TAG_TBODY); boolean isColumnGroup = facetBody.getNodeName() - .endsWith(":columnGroup"); - boolean isSubTable = facetBody.getNodeName().endsWith(":subTable"); + .endsWith(":columnGroup"); //$NON-NLS-1$ + boolean isSubTable = facetBody.getNodeName().endsWith(":subTable"); //$NON-NLS-1$ if (isColumnGroup) { RichFacesColumnGroupTemplate.DEFAULT_INSTANCE.encode(pageContext, creationData, facetBody, visualDocument, tbody); @@ -612,12 +613,12 @@ tr.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, CSS_BUTTON_CLASS); td.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, - CSS_BUTTON_CONTENT_CLASS + " " + cssStyleName + " " + CSS_BUTTON_CONTENT_CLASS + " " + cssStyleName + " " //$NON-NLS-1$ //$NON-NLS-2$ + customStyleClass); fecetDiv.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, - CSS_BUTTON_CLASS + " " + CSS_BUTTON_CONTENT_CLASS + " " - + cssStyleName + " " + customStyleClass); + CSS_BUTTON_CLASS + " " + CSS_BUTTON_CONTENT_CLASS + " " //$NON-NLS-1$ //$NON-NLS-2$ + + cssStyleName + " " + customStyleClass); //$NON-NLS-1$ } } @@ -655,8 +656,8 @@ String skinFirstRowClass, String skinCellClass, String facetBodyClass, String element) { boolean isColumnGroup = facetBody.getNodeName() - .endsWith(":columnGroup"); - boolean isSubTable = facetBody.getNodeName().endsWith(":subTable"); + .endsWith(":columnGroup"); //$NON-NLS-1$ + boolean isSubTable = facetBody.getNodeName().endsWith(":subTable"); //$NON-NLS-1$ if (isColumnGroup) { RichFacesColumnGroupTemplate.DEFAULT_INSTANCE.encode(pageContext, creationData, facetBody, visualDocument, parentTheadOrTfood); @@ -715,18 +716,18 @@ ArrayList<Element> headersOrFooters, String skinCellClass, String headerClass, String facetName, String element) { for (Element column : headersOrFooters) { - String classAttribute = facetName + "Class"; + String classAttribute = facetName + "Class"; //$NON-NLS-1$ String columnHeaderClass = column.getAttribute(classAttribute); nsIDOMElement td = visualDocument.createElement(element); parentTr.appendChild(td); - td.setAttribute(HtmlComponentUtil.HTML_ATTR_BACKGROUND, "file:///" + td.setAttribute(HtmlComponentUtil.HTML_ATTR_BACKGROUND, "file:///" //$NON-NLS-1$ + ComponentUtil.getAbsoluteResourcePath(HEADER_CELL_BG).replace('\\', '/')); String styleClass = ComponentUtil.encodeStyleClass(null, skinCellClass, headerClass, columnHeaderClass); td.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, styleClass); - td.setAttribute("scop", "col"); + td.setAttribute("scop", "col"); //$NON-NLS-1$ //$NON-NLS-2$ String colspan = column .getAttribute(HtmlComponentUtil.HTML_TABLE_COLSPAN); @@ -771,7 +772,7 @@ int count = 0; // check for exact value in component try { - count = Integer.parseInt(sourceElement.getAttribute("columns")); + count = Integer.parseInt(sourceElement.getAttribute("columns")); //$NON-NLS-1$ } catch (NumberFormatException e) { // calculate max html columns count for all columns/rows children. count = calculateRowColumns(sourceElement, columns); @@ -790,7 +791,7 @@ for (Element column : columns) { if (ComponentUtil.isRendered(column)) { String nodeName = column.getNodeName(); - if (nodeName.endsWith(":columnGroup")) { + if (nodeName.endsWith(":columnGroup")) { //$NON-NLS-1$ // Store max calculated value of previous rows. count = Math.max(currentLength, count); // Calculate number of columns in row. @@ -804,7 +805,7 @@ } else if (nodeName.equals(sourceElement.getPrefix() + COLUMN) || nodeName.equals(sourceElement.getPrefix() + COLUMNS)) { - String breakBeforeStr = column.getAttribute("breakBefore"); + String breakBeforeStr = column.getAttribute("breakBefore"); //$NON-NLS-1$ boolean breakBefore = Boolean.getBoolean(breakBeforeStr); // For new row, save length of previous. Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPickListTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPickListTemplate.java 2009-07-27 07:43:39 UTC (rev 16811) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPickListTemplate.java 2009-07-27 08:01:32 UTC (rev 16812) @@ -239,8 +239,8 @@ final nsIDOMElement itemsTableTBody = visualDocument.createElement(HTML.TAG_TBODY); itemsTable.setAttribute(HTML.ATTR_CLASS, RICH_PICKLIST_INTERNAL_TAB_CSS_CLASS); - itemsTable.setAttribute(HTML.ATTR_CELLPADDING, "0"); - itemsTable.setAttribute(HTML.ATTR_CELLPADDING, "0"); + itemsTable.setAttribute(HTML.ATTR_CELLPADDING, "0"); //$NON-NLS-1$ + itemsTable.setAttribute(HTML.ATTR_CELLPADDING, "0"); //$NON-NLS-1$ final VpeChildrenInfo childrensInfo = new VpeChildrenInfo(itemsTableTBody); creationData.addChildrenInfo(childrensInfo); for (Element selectItem : selectItems) { Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesProgressBarTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesProgressBarTemplate.java 2009-07-27 07:43:39 UTC (rev 16811) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesProgressBarTemplate.java 2009-07-27 08:01:32 UTC (rev 16812) @@ -39,31 +39,31 @@ public class RichFacesProgressBarTemplate extends AbstractRichFacesTemplate { /** The Constant DEFAULT_HEIGHT. */ - private static final String DEFAULT_HEIGHT = " height:13px;"; + private static final String DEFAULT_HEIGHT = " height:13px;"; //$NON-NLS-1$ /** The Constant CSS_EXTENSION. */ - private static final String CSS_EXTENSION = "progressBar"; + private static final String CSS_EXTENSION = "progressBar"; //$NON-NLS-1$ /** The Constant CSS_STYLE. */ - private static final String CSS_STYLE = "/progressBar.css"; + private static final String CSS_STYLE = "/progressBar.css"; //$NON-NLS-1$ /** The Constant FACET. */ - private static final String FACET = "facet"; + private static final String FACET = "facet"; //$NON-NLS-1$ /** The Constant OUTPUT_TEXT. */ - private static final String OUTPUT_TEXT = "outputText"; + private static final String OUTPUT_TEXT = "outputText"; //$NON-NLS-1$ /** The Constant PROGRESS_DIV_STYLE_CLASSES. */ - private static final String PROGRESS_DIV_STYLE_CLASSES = "rich-progress-bar-block rich-progress-bar-width rich-progress-bar-shell"; + private static final String PROGRESS_DIV_STYLE_CLASSES = "rich-progress-bar-block rich-progress-bar-width rich-progress-bar-shell"; //$NON-NLS-1$ /** The Constant TEXT_ALIGN_LEFT. */ - private static final String TEXT_ALIGN_LEFT = "; text-align:left;"; + private static final String TEXT_ALIGN_LEFT = "; text-align:left;"; //$NON-NLS-1$ /** The Constant UPLOADED_DIV. */ - private static final String UPLOADED_DIV = "rich-progress-bar-height rich-progress-bar-uploaded null"; + private static final String UPLOADED_DIV = "rich-progress-bar-height rich-progress-bar-uploaded null"; //$NON-NLS-1$ /** The percentage. */ - private String percentage = "60%"; + private String percentage = "60%"; //$NON-NLS-1$ /** The style. */ private String style; @@ -98,7 +98,7 @@ String clazz = PROGRESS_DIV_STYLE_CLASSES; if (ComponentUtil.isNotBlank(this.styleClass)) { - clazz = clazz + " " + this.styleClass; + clazz = clazz + " " + this.styleClass; //$NON-NLS-1$ } progressDiv.setAttribute(HTML.ATTR_CLASS, clazz); progressDiv.setAttribute(HTML.ATTR_STYLE, this.style + TEXT_ALIGN_LEFT); @@ -106,7 +106,7 @@ final NodeList list = sourceNode.getChildNodes(); for(int i = 0 ; i < list.getLength() ; i ++ ){ - if(list.item(i).getNodeName().equalsIgnoreCase("h:outputText")){ + if(list.item(i).getNodeName().equalsIgnoreCase("h:outputText")){ //$NON-NLS-1$ elements.add(list.item(i)); } } @@ -114,13 +114,13 @@ if(ComponentUtil.isNotBlank(this.sourceLabel) || elements.size() > 0){ final nsIDOMElement labelDiv = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_DIV); // labelDiv.setAttribute(HTML.ATTR_CLASS, "rich-progress-bar-width rich-progress-bar-remained rich-progress-bar-padding"); - labelDiv.setAttribute(HTML.ATTR_STYLE,this.style+"; font-weight: bold; position: relative; text-align: center; "); + labelDiv.setAttribute(HTML.ATTR_STYLE,this.style+"; font-weight: bold; position: relative; text-align: center; "); //$NON-NLS-1$ uploadDiv.appendChild(labelDiv); if (elements.size() > 0) { final StringBuffer sb = new StringBuffer(); for (Node n : elements) { - sb.append(ComponentUtil.getAttribute((Element)n, "value")); + sb.append(ComponentUtil.getAttribute((Element)n, "value")); //$NON-NLS-1$ } labelDiv.appendChild(visualDocument.createTextNode(sb.toString())); } else { @@ -198,7 +198,7 @@ private void prepareData(Element source) { this.styleClass = ComponentUtil.getAttribute(source, RichFaces.ATTR_STYLE_CLASS); this.style = ComponentUtil.getAttribute(source, HTML.ATTR_STYLE); - this.sourceLabel = ComponentUtil.getAttribute(source, "label"); + this.sourceLabel = ComponentUtil.getAttribute(source, "label"); //$NON-NLS-1$ if (ComponentUtil.isBlank(this.style)) { this.style = DEFAULT_HEIGHT; } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesSeparatorTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesSeparatorTemplate.java 2009-07-27 07:43:39 UTC (rev 16811) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesSeparatorTemplate.java 2009-07-27 08:01:32 UTC (rev 16812) @@ -27,32 +27,32 @@ */ public class RichFacesSeparatorTemplate extends VpeAbstractTemplate { - final static String STYLE_PATH = "separator/separator.css"; + final static String STYLE_PATH = "separator/separator.css"; //$NON-NLS-1$ - final static String LINE_SOLID = "solid"; + final static String LINE_SOLID = "solid"; //$NON-NLS-1$ - final static String LINE_DOUBLE = "double"; + final static String LINE_DOUBLE = "double"; //$NON-NLS-1$ - final static String LINE_DOTTED = "dotted"; + final static String LINE_DOTTED = "dotted"; //$NON-NLS-1$ - final static String LINE_DASHED = "dashed"; + final static String LINE_DASHED = "dashed"; //$NON-NLS-1$ - final static String LINE_BEVELED = "beveled"; + final static String LINE_BEVELED = "beveled"; //$NON-NLS-1$ - final static String PIXEL_PREFIX = "px"; + final static String PIXEL_PREFIX = "px"; //$NON-NLS-1$ - final static String PERCENT_PREFIX = "%"; + final static String PERCENT_PREFIX = "%"; //$NON-NLS-1$ final static String[] LINE_TYPES = { LINE_SOLID, LINE_DOUBLE, LINE_DOTTED, LINE_DASHED, LINE_BEVELED }; - final static String LINE_TYPE_ATTR = "lineType"; + final static String LINE_TYPE_ATTR = "lineType"; //$NON-NLS-1$ - final static String DEFAULT_HEIGHT = "6px"; + final static String DEFAULT_HEIGHT = "6px"; //$NON-NLS-1$ - final static String DEFAULT_ALIGN = "left"; + final static String DEFAULT_ALIGN = "left"; //$NON-NLS-1$ - final static String DEFAULT_WIDTH = "100%"; + final static String DEFAULT_WIDTH = "100%"; //$NON-NLS-1$ /** * Creates a node of the visual tree on the node of the source tree. This @@ -68,7 +68,7 @@ * @return The information on the created node of the visual tree. */ public VpeCreationData create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument) { - ComponentUtil.setCSSLink(pageContext, STYLE_PATH, "richFacesSeparator"); + ComponentUtil.setCSSLink(pageContext, STYLE_PATH, "richFacesSeparator"); //$NON-NLS-1$ Element sourceElement = (Element) sourceNode; /* Create new html element table */ nsIDOMElement separator = visualDocument @@ -86,24 +86,24 @@ separator.setAttribute(HtmlComponentUtil.HTML_ALIGN_ATTR, (align == null ? DEFAULT_ALIGN : align)); separator.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, - "td-parentdiv"); - String lineClass = sourceElement.getAttribute("styleClass"); + "td-parentdiv"); //$NON-NLS-1$ + String lineClass = sourceElement.getAttribute("styleClass"); //$NON-NLS-1$ /* Apply class for separator */ String lineType = sourceElement.getAttribute(LINE_TYPE_ATTR); - String style = sourceElement.getAttribute("style"); + String style = sourceElement.getAttribute("style"); //$NON-NLS-1$ if (lineType == null || lineType.equalsIgnoreCase(LINE_BEVELED)) { line.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, - "dr-table-header rich-table-header-continue" - + (lineClass == null ? "" : lineClass)); + "dr-table-header rich-table-header-continue" //$NON-NLS-1$ + + (lineClass == null ? "" : lineClass)); //$NON-NLS-1$ style = setBeveledStyle(width, height, ComponentUtil .getHeaderBackgoundImgStyle() - + ";" + (style == null ? "" : style)); + + ";" + (style == null ? "" : style)); //$NON-NLS-1$ //$NON-NLS-2$ } else { line.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, - (lineClass == null ? "" : lineClass)); + (lineClass == null ? "" : lineClass)); //$NON-NLS-1$ style = setStyle(lineType, width, height, style); line.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, - "separator-color"); + "separator-color"); //$NON-NLS-1$ } line.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, style); separator.appendChild(line); @@ -133,7 +133,7 @@ if (lineType != null && lineType.equalsIgnoreCase(LINE_BEVELED)) { newStyle = setBeveledStyle(width, height, ComponentUtil .getHeaderBackgoundImgStyle() - + ";" + (style == null ? "" : style)); + + ";" + (style == null ? "" : style)); //$NON-NLS-1$ //$NON-NLS-2$ } else { newStyle = setStyle(lineType, (width == null ? DEFAULT_WIDTH : addPrefixSize(width)), @@ -150,7 +150,7 @@ } else { newStyle = setStyle(lineType, (width == null ? DEFAULT_WIDTH : addPrefixSize(width)), - (height == null ? DEFAULT_HEIGHT : height), ""); + (height == null ? DEFAULT_HEIGHT : height), ""); //$NON-NLS-1$ } line.setAttribute(name, newStyle); @@ -188,7 +188,7 @@ if (lineType.equalsIgnoreCase(LINE_BEVELED)) { newStyle = setBeveledStyle(width, value, ComponentUtil .getHeaderBackgoundImgStyle() - + ";" + (style == null ? "" : style)); + + ";" + (style == null ? "" : style)); //$NON-NLS-1$ //$NON-NLS-2$ } else { newStyle = setStyle( lineType, @@ -204,7 +204,7 @@ if (lineType.equalsIgnoreCase(LINE_BEVELED)) { newStyle = setBeveledStyle(value, height, ComponentUtil .getHeaderBackgoundImgStyle() - + ";" + (style == null ? "" : style)); + + ";" + (style == null ? "" : style)); //$NON-NLS-1$ //$NON-NLS-2$ } else { newStyle = setStyle(lineType, (value == null ? DEFAULT_WIDTH : addPrefixSize(value)), @@ -219,7 +219,7 @@ if (value.equalsIgnoreCase(LINE_BEVELED)) { newStyle = setBeveledStyle(width, height, ComponentUtil .getHeaderBackgoundImgStyle() - + ";" + (style == null ? "" : style)); + + ";" + (style == null ? "" : style)); //$NON-NLS-1$ //$NON-NLS-2$ } else { newStyle = setStyle(value, (width == null ? DEFAULT_WIDTH : addPrefixSize(width)), @@ -233,7 +233,7 @@ if (lineType.equalsIgnoreCase(LINE_BEVELED)) { newStyle = setBeveledStyle(width, value, ComponentUtil .getHeaderBackgoundImgStyle() - + ";" + (value == null ? "" : value)); + + ";" + (value == null ? "" : value)); //$NON-NLS-1$ //$NON-NLS-2$ } else { newStyle = setStyle(lineType, (width == null ? DEFAULT_WIDTH : addPrefixSize(width)), @@ -325,10 +325,10 @@ private String setStyle(String lineType, String width, String height, String style) { StringBuffer newStyle = new StringBuffer(); - newStyle.append(HtmlComponentUtil.CSS_BORDER_STYLE + ":" + (lineType == null ? LINE_SOLID : lineType) + ";"); - newStyle.append(HtmlComponentUtil.CSS_BORDER_WIDTH + ":" + (height == null ? DEFAULT_HEIGHT : height) + " 0px 0px;"); - newStyle.append(HtmlComponentUtil.HTML_ATR_WIDTH + ":" + (width == null ? DEFAULT_WIDTH : width) + ";"); - newStyle.append((style == null ? "" : style)); + newStyle.append(HtmlComponentUtil.CSS_BORDER_STYLE + ":" + (lineType == null ? LINE_SOLID : lineType) + ";"); //$NON-NLS-1$ //$NON-NLS-2$ + newStyle.append(HtmlComponentUtil.CSS_BORDER_WIDTH + ":" + (height == null ? DEFAULT_HEIGHT : height) + " 0px 0px;"); //$NON-NLS-1$ //$NON-NLS-2$ + newStyle.append(HtmlComponentUtil.HTML_ATR_WIDTH + ":" + (width == null ? DEFAULT_WIDTH : width) + ";"); //$NON-NLS-1$ //$NON-NLS-2$ + newStyle.append((style == null ? "" : style)); //$NON-NLS-1$ return newStyle.toString(); } @@ -342,9 +342,9 @@ */ private String setBeveledStyle(String width, String height, String style) { StringBuffer newStyle = new StringBuffer(); - newStyle.append(HtmlComponentUtil.HTML_ATR_HEIGHT + ":" + (height == null ? DEFAULT_HEIGHT : height) + ";"); - newStyle.append(HtmlComponentUtil.HTML_ATR_WIDTH + ":" + (width == null ? DEFAULT_WIDTH : width) + ";"); - newStyle.append((style == null ? "" : style)); + newStyle.append(HtmlComponentUtil.HTML_ATR_HEIGHT + ":" + (height == null ? DEFAULT_HEIGHT : height) + ";"); //$NON-NLS-1$ //$NON-NLS-2$ + newStyle.append(HtmlComponentUtil.HTML_ATR_WIDTH + ":" + (width == null ? DEFAULT_WIDTH : width) + ";"); //$NON-NLS-1$ //$NON-NLS-2$ + newStyle.append((style == null ? "" : style)); //$NON-NLS-1$ return newStyle.toString(); } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesToggleControlTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesToggleControlTemplate.java 2009-07-27 07:43:39 UTC (rev 16811) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesToggleControlTemplate.java 2009-07-27 08:01:32 UTC (rev 16812) @@ -42,30 +42,30 @@ Element sourceElement = (Element)sourceNode; - nsIDOMElement span = visualDocument.createElement("span"); + nsIDOMElement span = visualDocument.createElement("span"); //$NON-NLS-1$ storedSwitchSpan = span; VpeCreationData creationData = new VpeCreationData(span); - String forIds = sourceElement.getAttribute("for"); - String value = sourceElement.getAttribute("value"); - String switchToState = sourceElement.getAttribute("switchToState"); + String forIds = sourceElement.getAttribute("for"); //$NON-NLS-1$ + String value = sourceElement.getAttribute("value"); //$NON-NLS-1$ + String switchToState = sourceElement.getAttribute("switchToState"); //$NON-NLS-1$ ComponentUtil.correctAttribute(sourceElement, span, - "styleClass", - HtmlComponentUtil.HTML_CLASS_ATTR, "", ""); + "styleClass", //$NON-NLS-1$ + HtmlComponentUtil.HTML_CLASS_ATTR, "", ""); //$NON-NLS-1$ //$NON-NLS-2$ ComponentUtil.correctAttribute(sourceElement, span, - "style", - HtmlComponentUtil.HTML_STYLE_ATTR, "color:blue;text-decoration:underline;", "color:blue;text-decoration:underline;"); + "style", //$NON-NLS-1$ + HtmlComponentUtil.HTML_STYLE_ATTR, "color:blue;text-decoration:underline;", "color:blue;text-decoration:underline;"); //$NON-NLS-1$ //$NON-NLS-2$ - span.setAttribute("vpe-user-toggle-id", (switchToState == null ? "" : switchToState.trim())); + span.setAttribute("vpe-user-toggle-id", (switchToState == null ? "" : switchToState.trim())); //$NON-NLS-1$ //$NON-NLS-2$ List<Node> children = ComponentUtil.getChildren(sourceElement); VpeChildrenInfo bodyInfo = new VpeChildrenInfo(span); //string shoudn't be null, if then it's crash application if(value==null){ - value=""; + value=""; //$NON-NLS-1$ } nsIDOMNode valueText = visualDocument.createTextNode(value); span.appendChild(valueText); @@ -90,9 +90,9 @@ super.validate(pageContext, sourceNode, visualDocument, data); if (storedSwitchSpan == null) return; - String value = storedSwitchSpan.getAttribute("vpe-user-toggle-id"); - applyAttributeValueOnChildren("vpe-user-toggle-id", value, ComponentUtil.getChildren(storedSwitchSpan)); - applyAttributeValueOnChildren("vpe-user-toggle-lookup-parent", "true", ComponentUtil.getChildren(storedSwitchSpan)); + String value = storedSwitchSpan.getAttribute("vpe-user-toggle-id"); //$NON-NLS-1$ + applyAttributeValueOnChildren("vpe-user-toggle-id", value, ComponentUtil.getChildren(storedSwitchSpan)); //$NON-NLS-1$ + applyAttributeValueOnChildren("vpe-user-toggle-lookup-parent", "true", ComponentUtil.getChildren(storedSwitchSpan)); //$NON-NLS-1$ //$NON-NLS-2$ } private void applyAttributeValueOnChildren(String attrName, String attrValue, List<nsIDOMNode> children) { @@ -113,10 +113,10 @@ Element sourceElement = (Element)(sourceNode instanceof Element ? sourceNode : sourceNode.getParentNode()); - String forIds = sourceElement.getAttribute("for"); + String forIds = sourceElement.getAttribute("for"); //$NON-NLS-1$ if (forIds == null) return; - StringTokenizer st = new StringTokenizer(forIds.trim(), ",", false); + StringTokenizer st = new StringTokenizer(forIds.trim(), ",", false); //$NON-NLS-1$ while (st.hasMoreElements()) { String id = st.nextToken().trim(); if (null == id) continue; @@ -149,8 +149,8 @@ if(child instanceof Element) { Element childElement = (Element)child; - if (childElement.getNodeName().endsWith(":togglePanel") && - id.equals(childElement.getAttribute("id")) ) { + if (childElement.getNodeName().endsWith(":togglePanel") && //$NON-NLS-1$ + id.equals(childElement.getAttribute("id")) ) { //$NON-NLS-1$ list.add(childElement); } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTogglePanelTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTogglePanelTemplate.java 2009-07-27 07:43:39 UTC (rev 16811) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTogglePanelTemplate.java 2009-07-27 08:01:32 UTC (rev 16812) @@ -39,7 +39,7 @@ Element sourceElement = (Element)sourceNode; - nsIDOMElement div = visualDocument.createElement("div"); + nsIDOMElement div = visualDocument.createElement("div"); //$NON-NLS-1$ VpeCreationData creationData = new VpeCreationData(div); @@ -73,9 +73,9 @@ for (int i = 0; children != null && i < children.getLength(); i++) { Node child = children.item(i); - if (child instanceof Element && child.getNodeName().endsWith(":facet")) { + if (child instanceof Element && child.getNodeName().endsWith(":facet")) { //$NON-NLS-1$ Element facet = (Element)child; - String name = ((Element)facet).getAttribute("name"); + String name = ((Element)facet).getAttribute("name"); //$NON-NLS-1$ if (name != null) { states.put(name, facet); } @@ -85,11 +85,11 @@ } private String getInitialState(Element sourceElement) { - String initialState = sourceElement.getAttribute("initialState"); + String initialState = sourceElement.getAttribute("initialState"); //$NON-NLS-1$ - String stateOrder = sourceElement.getAttribute("stateOrder"); + String stateOrder = sourceElement.getAttribute("stateOrder"); //$NON-NLS-1$ if(stateOrder!=null) { - StringTokenizer st = new StringTokenizer(stateOrder.trim(), ",", false); + StringTokenizer st = new StringTokenizer(stateOrder.trim(), ",", false); //$NON-NLS-1$ String firstState = null; while(st.hasMoreElements()) { String state = st.nextToken().trim(); @@ -116,7 +116,7 @@ private String getActiveState(Element sourceElement) { String activeStateStr; - String stateOrder = sourceElement.getAttribute("stateOrder"); + String stateOrder = sourceElement.getAttribute("stateOrder"); //$NON-NLS-1$ if(null == stateOrder) return null; activeStateStr = (String)toggleMap.get(sourceElement); @@ -129,11 +129,11 @@ } private String getNextState(Element sourceElement, String toggleId) { - String stateOrder = sourceElement.getAttribute("stateOrder"); + String stateOrder = sourceElement.getAttribute("stateOrder"); //$NON-NLS-1$ if(null == stateOrder) return null; String activeState = getActiveState(sourceElement); - StringTokenizer st = new StringTokenizer(stateOrder.trim(), ",", false); + StringTokenizer st = new StringTokenizer(stateOrder.trim(), ",", false); //$NON-NLS-1$ String firstState = null; while (st.hasMoreElements()) { String state = st.nextToken(); Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesVirtualEarthTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesVirtualEarthTemplate.java 2009-07-27 07:43:39 UTC (rev 16811) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesVirtualEarthTemplate.java 2009-07-27 08:01:32 UTC (rev 16812) @@ -29,15 +29,15 @@ */ public class RichFacesVirtualEarthTemplate extends VpeAbstractTemplate { - private static String EARTH_AERIAL = "/virtualEarth/earth_aerial.png"; - private static String EARTH_HYBRID = "/virtualEarth/earth_hybrid.png"; - private static String EARTH_ROAD = "/virtualEarth/earth_road.png"; + private static String EARTH_AERIAL = "/virtualEarth/earth_aerial.png"; //$NON-NLS-1$ + private static String EARTH_HYBRID = "/virtualEarth/earth_hybrid.png"; //$NON-NLS-1$ + private static String EARTH_ROAD = "/virtualEarth/earth_road.png"; //$NON-NLS-1$ - private static String MAP_STYLE_ATTRIBUTE_NAME = "mapStyle"; + private static String MAP_STYLE_ATTRIBUTE_NAME = "mapStyle"; //$NON-NLS-1$ - private static String MAP_STYLE_VALUES[] = { "road", "aerial", "hybrid" }; + private static String MAP_STYLE_VALUES[] = { "road", "aerial", "hybrid" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - private static String STYLE_CLASS_ATTR_NAME = "styleClass"; + private static String STYLE_CLASS_ATTR_NAME = "styleClass"; //$NON-NLS-1$ public VpeCreationData create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument) { @@ -82,7 +82,7 @@ .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); if (name.equalsIgnoreCase(MAP_STYLE_ATTRIBUTE_NAME)) { - if (value.trim().equalsIgnoreCase("") + if (value.trim().equalsIgnoreCase("") //$NON-NLS-1$ || !searchInMapStyleValues(value)) { ComponentUtil.setImg(img, EARTH_ROAD); return; Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/seam/test/unit/SeamTextTest.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/seam/test/unit/SeamTextTest.java 2009-07-27 07:43:39 UTC (rev 16811) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/seam/test/unit/SeamTextTest.java 2009-07-27 08:01:32 UTC (rev 16812) @@ -24,7 +24,7 @@ public class SeamTextTest { public static void main(String[] args) throws Exception { - Reader r = new InputStreamReader( SeamTextTest.class.getResourceAsStream("SeamTextTest.txt") ); + Reader r = new InputStreamReader( SeamTextTest.class.getResourceAsStream("SeamTextTest.txt") ); //$NON-NLS-1$ SeamTextLexer lexer = new SeamTextLexer(r); SeamTextParser parser = new SeamTextParser(lexer); parser.startRule(); Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/seam/text/xpl/SeamTextLexer.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/seam/text/xpl/SeamTextLexer.java 2009-07-27 07:43:39 UTC (rev 16811) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/seam/text/xpl/SeamTextLexer.java 2009-07-27 08:01:32 UTC (rev 16812) @@ -26,6 +26,7 @@ import antlr.collections.impl.BitSet; import antlr.SemanticException; +@SuppressWarnings("nls") public class SeamTextLexer extends antlr.CharScanner implements SeamTextParserTokenTypes, TokenStream { public SeamTextLexer(InputStream in) { Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/seam/text/xpl/SeamTextParser.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/seam/text/xpl/SeamTextParser.java 2009-07-27 07:43:39 UTC (rev 16811) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/seam/text/xpl/SeamTextParser.java 2009-07-27 08:01:32 UTC (rev 16812) @@ -16,6 +16,7 @@ import antlr.ParserSharedInputState; import antlr.collections.impl.BitSet; +@SuppressWarnings("nls") public class SeamTextParser extends antlr.LLkParser implements SeamTextParserTokenTypes { Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/SeamTemplatesActivator.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/SeamTemplatesActivator.java 2009-07-27 07:43:39 UTC (rev 16811) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/SeamTemplatesActivator.java 2009-07-27 08:01:32 UTC (rev 16812) @@ -22,7 +22,7 @@ public class SeamTemplatesActivator extends BaseUIPlugin { // The plug-in ID - public static final String PLUGIN_ID = "org.jboss.tools.jsf.vpe.seam"; + public static final String PLUGIN_ID = "org.jboss.tools.jsf.vpe.seam"; //$NON-NLS-1$ // The shared instance private static SeamTemplatesActivator plugin; Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/el/AbstractELCompletionEngine.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/el/AbstractELCompletionEngine.java 2009-07-27 07:43:39 UTC (rev 16811) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/el/AbstractELCompletionEngine.java 2009-07-27 08:01:32 UTC (rev 16812) @@ -600,7 +600,7 @@ String filter = expr.getMemberName(); boolean bSurroundWithQuotes = false; if(filter == null) { - filter = ""; + filter = ""; //$NON-NLS-1$ bSurroundWithQuotes = true; } else { if((filter.startsWith("'") || filter.startsWith("\"")) //$NON-NLS-1$ //$NON-NLS-2$

16 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r16811 - in tags/jbpm-jpdl-4.0.0: org.jboss.tools.jbpm4.tests.feature and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: koen.aers(a)jboss.com Date: 2009-07-27 03:43:39 -0400 (Mon, 27 Jul 2009) New Revision: 16811 Added: tags/jbpm-jpdl-4.0.0/org.jboss.tools.jbpm4.tests.feature/ tags/jbpm-jpdl-4.0.0/org.jboss.tools.jbpm4.tests.feature/feature.xml Removed: tags/jbpm-jpdl-4.0.0/org.jboss.tools.jbpm4.tests.feature/feature.xml Log: Copied: tags/jbpm-jpdl-4.0.0/org.jboss.tools.jbpm4.tests.feature (from rev 16346, trunk/jbpm/features/org.jboss.tools.jbpm4.tests.feature) Deleted: tags/jbpm-jpdl-4.0.0/org.jboss.tools.jbpm4.tests.feature/feature.xml =================================================================== --- trunk/jbpm/features/org.jboss.tools.jbpm4.tests.feature/feature.xml 2009-07-02 17:05:41 UTC (rev 16346) +++ tags/jbpm-jpdl-4.0.0/org.jboss.tools.jbpm4.tests.feature/feature.xml 2009-07-27 07:43:39 UTC (rev 16811) @@ -1,79 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<feature - id="org.jboss.tools.jbpm4.tests.feature" - label="%featureName" - version="1.0.0.qualifier" - provider-name="%featureProvider"> - - <description> - %description - </description> - - <copyright> - %copyright - </copyright> - - <license url="%licenseURL"> - %license - </license> - -  - - <plugin - id="org.eclipse.ant.optional.junit" - download-size="0" - install-size="0" - version="0.0.0" - fragment="true"/> - - <plugin - id="org.eclipse.test" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.flow.jpdl4.multipage.test" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.flow.jpdl4.multipage.test.source" - download-size="0" - install-size="0" - version="0.0.0"/> - -  - - <plugin - id="org.jboss.tools.jbpm.common.test" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jbpm.common.test.source" - download-size="0" - install-size="0" - version="0.0.0"/> - -</feature> Copied: tags/jbpm-jpdl-4.0.0/org.jboss.tools.jbpm4.tests.feature/feature.xml (from rev 16810, trunk/jbpm/features/org.jboss.tools.jbpm4.tests.feature/feature.xml) =================================================================== --- tags/jbpm-jpdl-4.0.0/org.jboss.tools.jbpm4.tests.feature/feature.xml (rev 0) +++ tags/jbpm-jpdl-4.0.0/org.jboss.tools.jbpm4.tests.feature/feature.xml 2009-07-27 07:43:39 UTC (rev 16811) @@ -0,0 +1,79 @@ +<?xml version="1.0" encoding="UTF-8"?> +<feature + id="org.jboss.tools.jbpm4.tests.feature" + label="%featureName" + version="1.0.0.qualifier" + provider-name="%featureProvider"> + + <description> + %description + </description> + + <copyright> + %copyright + </copyright> + + <license url="%licenseURL"> + %license + </license> + +  + + <plugin + id="org.eclipse.ant.optional.junit" + download-size="0" + install-size="0" + version="0.0.0" + fragment="true"/> + + <plugin + id="org.eclipse.test" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.flow.jpdl4.multipage.test" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.flow.jpdl4.multipage.test.source" + download-size="0" + install-size="0" + version="0.0.0"/> + +  + + <plugin + id="org.jboss.tools.jbpm.common.test" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jbpm.common.test.source" + download-size="0" + install-size="0" + version="0.0.0"/> + +</feature>

16 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r16810 - trunk/jbpm/features/org.jboss.tools.jbpm4.tests.feature.

by jbosstools-commits＠lists.jboss.org

Author: koen.aers(a)jboss.com Date: 2009-07-27 03:42:45 -0400 (Mon, 27 Jul 2009) New Revision: 16810 Modified: trunk/jbpm/features/org.jboss.tools.jbpm4.tests.feature/feature.xml Log: Modified: trunk/jbpm/features/org.jboss.tools.jbpm4.tests.feature/feature.xml =================================================================== --- trunk/jbpm/features/org.jboss.tools.jbpm4.tests.feature/feature.xml 2009-07-27 07:40:57 UTC (rev 16809) +++ trunk/jbpm/features/org.jboss.tools.jbpm4.tests.feature/feature.xml 2009-07-27 07:42:45 UTC (rev 16810) @@ -17,6 +17,14 @@ %license </license> +  + <plugin id="org.eclipse.ant.optional.junit" download-size="0" @@ -42,4 +50,30 @@ install-size="0" version="0.0.0"/> +  + + <plugin + id="org.jboss.tools.jbpm.common.test" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jbpm.common.test.source" + download-size="0" + install-size="0" + version="0.0.0"/> + </feature>

16 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r16809 - in tags/jbpm-jpdl-4.0.0: org.jboss.tools.jbpm4.sdk.feature and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: koen.aers(a)jboss.com Date: 2009-07-27 03:40:57 -0400 (Mon, 27 Jul 2009) New Revision: 16809 Added: tags/jbpm-jpdl-4.0.0/org.jboss.tools.jbpm4.sdk.feature/ tags/jbpm-jpdl-4.0.0/org.jboss.tools.jbpm4.sdk.feature/build.properties tags/jbpm-jpdl-4.0.0/org.jboss.tools.jbpm4.sdk.feature/feature.xml Removed: tags/jbpm-jpdl-4.0.0/org.jboss.tools.jbpm4.sdk.feature/build.properties tags/jbpm-jpdl-4.0.0/org.jboss.tools.jbpm4.sdk.feature/feature.xml Log: Copied: tags/jbpm-jpdl-4.0.0/org.jboss.tools.jbpm4.sdk.feature (from rev 16346, trunk/jbpm/features/org.jboss.tools.jbpm4.sdk.feature) Deleted: tags/jbpm-jpdl-4.0.0/org.jboss.tools.jbpm4.sdk.feature/build.properties =================================================================== --- trunk/jbpm/features/org.jboss.tools.jbpm4.sdk.feature/build.properties 2009-07-02 17:05:41 UTC (rev 16346) +++ tags/jbpm-jpdl-4.0.0/org.jboss.tools.jbpm4.sdk.feature/build.properties 2009-07-27 07:40:57 UTC (rev 16809) @@ -1,7 +0,0 @@ -bin.includes = feature.xml - -generate.feature(a)org.jboss.tools.flow.jpdl4.source.feature=org.jboss.tools.flow.jpdl4.feature -generate.feature(a)org.jboss.tools.flow.common.source.feature=org.jboss.tools.flow.common.feature -generate.feature(a)org.jboss.tools.jbpm.common.source.feature=org.jboss.tools.jbpm.common.feature -generate.feature(a)org.jboss.tools.jbpm.convert.source.feature=org.jboss.tools.jbpm.convert.feature -generate.feature(a)org.jbpm.gd.jpdl.source.feature=org.jbpm.gd.jpdl.feature Copied: tags/jbpm-jpdl-4.0.0/org.jboss.tools.jbpm4.sdk.feature/build.properties (from rev 16472, trunk/jbpm/features/org.jboss.tools.jbpm4.sdk.feature/build.properties) =================================================================== --- tags/jbpm-jpdl-4.0.0/org.jboss.tools.jbpm4.sdk.feature/build.properties (rev 0) +++ tags/jbpm-jpdl-4.0.0/org.jboss.tools.jbpm4.sdk.feature/build.properties 2009-07-27 07:40:57 UTC (rev 16809) @@ -0,0 +1,8 @@ +bin.includes = feature.xml,\ + feature.properties + +generate.feature(a)org.jboss.tools.flow.jpdl4.source.feature=org.jboss.tools.flow.jpdl4.feature +generate.feature(a)org.jboss.tools.flow.common.source.feature=org.jboss.tools.flow.common.feature +generate.feature(a)org.jboss.tools.jbpm.common.source.feature=org.jboss.tools.jbpm.common.feature +generate.feature(a)org.jboss.tools.jbpm.convert.source.feature=org.jboss.tools.jbpm.convert.feature +generate.feature(a)org.jbpm.gd.jpdl.source.feature=org.jbpm.gd.jpdl.feature Deleted: tags/jbpm-jpdl-4.0.0/org.jboss.tools.jbpm4.sdk.feature/feature.xml =================================================================== --- trunk/jbpm/features/org.jboss.tools.jbpm4.sdk.feature/feature.xml 2009-07-02 17:05:41 UTC (rev 16346) +++ tags/jbpm-jpdl-4.0.0/org.jboss.tools.jbpm4.sdk.feature/feature.xml 2009-07-27 07:40:57 UTC (rev 16809) @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<feature - id="org.jboss.tools.jbpm4.sdk.feature" - label="%" - version="4.0.0.qualifier"> - - <description> - %description - </description> - - <copyright> - %copyright - </copyright> - - <license url="%licenseURL"> - %license - </license> - - <includes - id="org.jboss.tools.jbpm.common.feature" - version="0.0.0"/> - - <includes - id="org.jboss.tools.jbpm.common.source.feature" - version="0.0.0"/> - - <includes - id="org.jboss.tools.flow.common.feature" - version="0.0.0"/> - - <includes - id="org.jboss.tools.flow.common.source.feature" - version="0.0.0"/> - - <includes - id="org.jboss.tools.flow.jpdl4.feature" - version="0.0.0"/> - - <includes - id="org.jboss.tools.flow.jpdl4.source.feature" - version="0.0.0"/> - - - -</feature> Copied: tags/jbpm-jpdl-4.0.0/org.jboss.tools.jbpm4.sdk.feature/feature.xml (from rev 16438, trunk/jbpm/features/org.jboss.tools.jbpm4.sdk.feature/feature.xml) =================================================================== --- tags/jbpm-jpdl-4.0.0/org.jboss.tools.jbpm4.sdk.feature/feature.xml (rev 0) +++ tags/jbpm-jpdl-4.0.0/org.jboss.tools.jbpm4.sdk.feature/feature.xml 2009-07-27 07:40:57 UTC (rev 16809) @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<feature + id="org.jboss.tools.jbpm4.sdk.feature" + label="%featureName" + version="4.0.0.qualifier" + provider-name="%featureProvider"> + + <description> + %description + </description> + + <copyright> + %copyright + </copyright> + + <license url="%licenseURL"> + %license + </license> + + <includes + id="org.jboss.tools.jbpm.common.feature" + version="0.0.0"/> + + <includes + id="org.jboss.tools.jbpm.common.source.feature" + version="0.0.0"/> + + <includes + id="org.jboss.tools.flow.common.feature" + version="0.0.0"/> + + <includes + id="org.jboss.tools.flow.common.source.feature" + version="0.0.0"/> + + <includes + id="org.jboss.tools.flow.jpdl4.feature" + version="0.0.0"/> + + <includes + id="org.jboss.tools.flow.jpdl4.source.feature" + version="0.0.0"/> + +</feature>

16 years, 8 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits July 2009