September 2008 - jbosstools-commits

JBoss Tools SVN: r10257 - trunk/archives/util.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2008-09-16 17:52:35 -0400 (Tue, 16 Sep 2008) New Revision: 10257 Added: trunk/archives/util/packaging-convert/ Log: JBIDE-2776 saving packaging-convert Copied: trunk/archives/util/packaging-convert (from rev 10256, trunk/core/util/packaging-convert)

16 years

1
0
0 / 0

JBoss Tools SVN: r10256 - in trunk: archives and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2008-09-16 17:50:56 -0400 (Tue, 16 Sep 2008) New Revision: 10256 Added: trunk/archives/ trunk/archives/features/ trunk/archives/plugins/ trunk/archives/tests/ trunk/archives/util/ Log: JBIDE-2776 setting up archives structure

16 years

1
0
0 / 0

JBoss Tools SVN: r10255 - trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/utils.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2008-09-16 15:06:48 -0400 (Tue, 16 Sep 2008) New Revision: 10255 Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/utils/UIUtils.java Log: Fix exception handling code. catch (Exception ex) block changed to catch(IOException ex). Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/utils/UIUtils.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/utils/UIUtils.java 2008-09-16 17:22:03 UTC (rev 10254) +++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/utils/UIUtils.java 2008-09-16 19:06:48 UTC (rev 10255) @@ -295,7 +295,7 @@ fos.write(array, 0, c); } } - catch (Exception e) { + catch (IOException e) { e.printStackTrace(); } finally { @@ -303,7 +303,7 @@ fos.close(); is.close(); } - catch (Exception e) { + catch (IOException e) { e.printStackTrace(); } }

16 years

1
0
0 / 0

JBoss Tools SVN: r10254 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template.

by jbosstools-commits＠lists.jboss.org

Author: mareshkau Date: 2008-09-16 13:22:03 -0400 (Tue, 16 Sep 2008) New Revision: 10254 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeEditAnyDialog.java Log: =JBIDE-2521 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeEditAnyDialog.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeEditAnyDialog.java 2008-09-16 14:41:40 UTC (rev 10253) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeEditAnyDialog.java 2008-09-16 17:22:03 UTC (rev 10254) @@ -13,13 +13,22 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.Map.Entry; import org.eclipse.jface.dialogs.TitleAreaDialog; +import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.swt.SWT; +import org.eclipse.swt.events.DisposeEvent; +import org.eclipse.swt.events.DisposeListener; 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.events.SelectionListener; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.graphics.RGB; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; @@ -31,6 +40,12 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; +import org.jboss.tools.jst.jsp.JspEditorPlugin; +import org.jboss.tools.jst.jsp.outline.cssdialog.common.Constants; +import org.jboss.tools.jst.jsp.outline.cssdialog.common.ImageCombo; +import org.jboss.tools.jst.jsp.outline.cssdialog.common.MessageUtil; +import org.jboss.tools.jst.jsp.outline.cssdialog.common.Util; +import org.jboss.tools.jst.jsp.outline.cssdialog.parsers.ColorParser; import org.jboss.tools.vpe.messages.VpeUIMessages; public class VpeEditAnyDialog extends TitleAreaDialog { @@ -82,7 +97,7 @@ ((GridData)topComposite.getLayoutData()).widthHint = 300; Composite composite = new Composite(topComposite, SWT.NONE); - GridLayout gridLayout = new GridLayout(2, false); + GridLayout gridLayout = new GridLayout(3, false); gridLayout.marginWidth = 50; gridLayout.marginHeight = 20; gridLayout.horizontalSpacing = 5; @@ -99,6 +114,7 @@ tagFDisplayLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING)); cbTagForDisplay = new Combo(composite,SWT.DROP_DOWN | SWT.READ_ONLY); + gd.horizontalSpan=2; cbTagForDisplay.setLayoutData(gd); cbTagForDisplay.setItems(displayTags.toArray(new String[displayTags.size()])); cbTagForDisplay.select(0); @@ -116,7 +132,7 @@ lblDisplay.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING)); cbDisplay = new Combo(composite, SWT.DROP_DOWN | SWT.READ_ONLY); -// gd.horizontalSpan = 2; + gd.horizontalSpan = 2; cbDisplay.setLayoutData(gd); cbDisplay.setItems(displayItems); displayIndexMem = getDisplayItemIndex(data.getDisplay()); @@ -128,7 +144,7 @@ lblValue.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING)); txtValue = new Text(composite, SWT.BORDER); gd = new GridData(GridData.FILL_HORIZONTAL); -// gd.horizontalSpan = 2; + gd.horizontalSpan = 2; txtValue.setLayoutData(gd); txtValue.setText(data.getValue() != null ? data.getValue() : ""); //$NON-NLS-1$ @@ -140,7 +156,7 @@ lblBorder.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING)); txtBorder = new Text(composite, SWT.BORDER); gd = new GridData(GridData.FILL_HORIZONTAL); -// gd.horizontalSpan = 2; + gd.horizontalSpan = 2; txtBorder.setLayoutData(gd); txtBorder.setText(data.getBorder() != null ? data.getBorder() : ""); //$NON-NLS-1$ @@ -236,7 +252,7 @@ label.setText(labelText); button = new Button(parent, SWT.CHECK); GridData gd = new GridData(GridData.BEGINNING); -// gd.horizontalSpan = 2; + gd.horizontalSpan = 2; button.setLayoutData(gd); button.setSelection(value); } @@ -254,27 +270,54 @@ public class ColorControl { private Composite parent; private Label label; - private Text text; -// private Button button; + private ImageCombo colorCombo; public ColorControl(Composite parent, String labelText, String value) { label = new Label(parent, SWT.NONE); label.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING)); label.setText(labelText); - text = new Text(parent, SWT.BORDER); - text.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - text.setText(value != null ? value : ""); //$NON-NLS-1$ -// button = new Button(parent, SWT.BUTTON1); -// button.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END)); -// button.setText("..."); -// button.addSelectionListener(new SelectionListener() { -// public void widgetSelected(SelectionEvent e) { -// selectColor(e.widget.getDisplay().getShells()[0]); -// } -// -// public void widgetDefaultSelected(SelectionEvent e) { -// } -// }); + colorCombo = new ImageCombo(parent, SWT.BORDER); + GridData gd =new GridData(GridData.HORIZONTAL_ALIGN_FILL); + gd.grabExcessHorizontalSpace =true; + colorCombo.setLayoutData(gd); + colorCombo.setText(value != null ? value : ""); //$NON-NLS-1$ + + Set<Entry<String, String>> set = ColorParser.getInstance().getMap() + .entrySet(); + + for (Map.Entry<String, String> me : set) { + RGB rgb = Util.getColor(me.getKey()); + colorCombo.add(me.getValue(), rgb); + } + Button button = new Button(parent, SWT.PUSH); + button.setLayoutData(new GridData()); + button.setToolTipText(MessageUtil.getString("BACKGROUND_COLOR_TIP")); //$NON-NLS-1$ + ImageDescriptor colorDesc = JspEditorPlugin + .getImageDescriptor(Constants.IMAGE_COLORLARGE_FILE_LOCATION); + Image im = colorDesc.createImage(); + button.setImage(im); + button.addDisposeListener(new DisposeListener() { + public void widgetDisposed(DisposeEvent e) { + Button button = (Button) e.getSource(); + button.getImage().dispose(); + } + }); + button.addSelectionListener(new SelectionAdapter() { + public void widgetSelected(SelectionEvent event) { + ColorDialog dlg = new ColorDialog(getShell()); + + dlg + .setRGB(Util.getColor((colorCombo.getText().trim())) == null ? new RGB( + 0, 0, 0) + : Util.getColor((colorCombo.getText().trim()))); + dlg.setText(MessageUtil.getString("COLOR_DIALOG_TITLE")); //$NON-NLS-1$ + RGB rgb = dlg.open(); + if (rgb != null) { + String colorStr = Util.createColorString(rgb); + colorCombo.setText(colorStr); + } + } + }); } public void selectColor(Shell shell) { @@ -283,7 +326,7 @@ } public String getText() { - return text.getText().trim(); + return colorCombo.getText().trim(); } } }

16 years

1
0
0 / 0

JBoss Tools SVN: r10253 - trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject.

by jbosstools-commits＠lists.jboss.org

Author: vyemialyanchyk Date: 2008-09-16 10:41:40 -0400 (Tue, 16 Sep 2008) New Revision: 10253 Added: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/TestUtilsCommon.java Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/MappingTestProject.java trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/ProjectUtil.java Log: small refactoring for junit tests for JBIDE-2077 Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/MappingTestProject.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/MappingTestProject.java 2008-09-16 13:45:34 UTC (rev 10252) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/MappingTestProject.java 2008-09-16 14:41:40 UTC (rev 10253) @@ -11,36 +11,21 @@ package org.hibernate.eclipse.console.test.mappingproject; import java.io.File; -import java.io.FileFilter; -import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.io.IOException; import java.net.URL; -import java.util.ArrayList; -import java.util.Arrays; import java.util.List; -import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IProjectDescription; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.IWorkspace; import org.eclipse.core.resources.IncrementalProjectBuilder; -import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; -import org.eclipse.jdt.core.IClasspathEntry; -import org.eclipse.jdt.core.IJavaElement; import org.eclipse.jdt.core.IJavaProject; -import org.eclipse.jdt.core.IPackageFragment; import org.eclipse.jdt.core.IPackageFragmentRoot; -import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.JavaModelException; -import org.eclipse.jdt.internal.core.PackageFragmentRoot; import org.eclipse.osgi.util.NLS; import org.hibernate.eclipse.console.test.ConsoleTestMessages; import org.hibernate.eclipse.console.test.HibernateConsoleTestPlugin; @@ -52,35 +37,11 @@ */ public class MappingTestProject{ - public static final String SRC_FOLDER = "src"; //$NON-NLS-1$ - - public static final String LIB_FOLDER = "lib"; //$NON-NLS-1$ - private static MappingTestProject singleton= null; - private static final Path JRE_CONTAINER = new Path("org.eclipse.jdt.launching.JRE_CONTAINER"); //$NON-NLS-1$ - public static String PROJECT_NAME = "MappingTestProject"; //$NON-NLS-1$ public static String RESOURCE_PATH = "res/project/"; //$NON-NLS-1$ - private static FileFilter fileFilter = new FileFilter(){ - public boolean accept(File pathname) { - return !pathname.isDirectory(); - }}; - - private static FileFilter dirFilter = new FileFilter(){ - public boolean accept(File pathname) { - //exclude ".svn" and other unnessesary folders - if (pathname.getName().charAt(0) == '.') return false; - if (LIB_FOLDER.equals(pathname.getName())) return false; - return pathname.isDirectory(); - }}; - - private static FileFilter jarFilter = new FileFilter(){ - public boolean accept(File pathname) { - return !pathname.isDirectory() || pathname.getName().endsWith(".jar"); //$NON-NLS-1$ - }}; - private IProject project; private IJavaProject javaProject; @@ -116,8 +77,9 @@ } private void buildBigTestProject() throws JavaModelException, CoreException, IOException { - project = buildNewProject(PROJECT_NAME); - javaProject = buildJavaProject(project); + TestUtilsCommon commonUtil = new TestUtilsCommon(); + project = commonUtil.buildNewProject(PROJECT_NAME); + javaProject = commonUtil.buildJavaProject(project); IPath resourcePath = new Path(RESOURCE_PATH); File resourceFolder = resourcePath.toFile(); @@ -131,154 +93,15 @@ throw new RuntimeException(out); } - IPackageFragmentRoot sourceFolder = createSourceFolder(project, javaProject); - recursiveCopyFiles(resourceFolder, (IFolder) sourceFolder.getResource()); - List<IPath> libs = copyLibs(resourceFolder); - generateClassPath(libs, sourceFolder); + IPackageFragmentRoot sourceFolder = commonUtil.createSourceFolder(project, javaProject); + commonUtil.recursiveCopyFiles(resourceFolder, (IFolder) sourceFolder.getResource()); + List<IPath> libs = commonUtil.copyLibs(project, javaProject, resourceFolder); + commonUtil.generateClassPath(javaProject, libs, sourceFolder); project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor()); } - private void recursiveCopyFiles(File src, IFolder dst){ - File[] files = src.listFiles(fileFilter); - for (int i = 0; i < files.length; i++) { - File file = files[i]; - if (!file.exists()) continue; - IFile iFile = dst.getFile(file.getName()); - try { - iFile.create(new FileInputStream(file), true, null); - } catch (FileNotFoundException e) { - e.printStackTrace(); - continue; - } catch (CoreException e) { - e.printStackTrace(); - continue; - } - } - File[] dirs = src.listFiles(dirFilter); - for (int i = 0; i < dirs.length; i++) { - File dir = dirs[i]; - if (!dir.exists()) continue; - IFolder iFolder = dst.getFolder(dir.getName()); - try { - iFolder.create(true, true, null); - recursiveCopyFiles(dir, iFolder); - } catch (CoreException e) { - e.printStackTrace(); - continue; - } - } - } - private List<IPath> copyLibs(File res) throws CoreException { - IFolder dst = project.getFolder(LIB_FOLDER); - if (!dst.exists()){ - dst.create(false, true, null); - javaProject.getPackageFragmentRoot(dst); - } - - File libFolder = new File(res.getAbsolutePath()+"/" + LIB_FOLDER); //$NON-NLS-1$ - if ( !libFolder.exists() ) { - String out = NLS.bind(ConsoleTestMessages.MappingTestProject_folder_not_found, - RESOURCE_PATH + "/" + LIB_FOLDER); //$NON-NLS-1$ - throw new RuntimeException(out); - } - - - List<IPath> libs = new ArrayList<IPath>(); - - File[] files = libFolder.listFiles(jarFilter); - for (int i = 0; i < files.length; i++) { - File file = files[i]; - if (!file.exists()) continue; - IFile iFile = dst.getFile(file.getName()); - try { - iFile.create(new FileInputStream(file), true, null); - libs.add(iFile.getFullPath()); - } catch (FileNotFoundException e) { - e.printStackTrace(); - continue; - } - } - return libs; - } - - private void generateClassPath(List<IPath> libs, IPackageFragmentRoot sourceFolder) throws JavaModelException{ - List<IClasspathEntry> entries = new ArrayList<IClasspathEntry>(); - //entries.addAll(Arrays.asList(javaProject.getRawClasspath())); - for (IPath lib_path : libs) { - entries.add(JavaCore.newLibraryEntry(lib_path, null, null)); - } - entries.add(JavaCore.newSourceEntry(sourceFolder.getPath())); - entries.add(JavaCore.newContainerEntry(JRE_CONTAINER)); - javaProject.setRawClasspath(entries.toArray(new IClasspathEntry[0]), null); - } - - - private IProject buildNewProject(String projectName) { - // get a project handle - final IProject newProjectHandle = ResourcesPlugin.getWorkspace() - .getRoot().getProject(projectName); - - // get a project descriptor - IWorkspace workspace = ResourcesPlugin.getWorkspace(); - final IProjectDescription description = workspace - .newProjectDescription(newProjectHandle.getName()); - - try { - createAndOpenProject(description, newProjectHandle); - } catch (CoreException ce) { - throw new RuntimeException(ce); - } - - return newProjectHandle; - } - - private void createAndOpenProject(IProjectDescription description, - IProject projectHandle) throws CoreException { - - projectHandle.create(description, null); - projectHandle.open(IResource.BACKGROUND_REFRESH, null); - } - - private IJavaProject buildJavaProject(IProject project) { - IJavaProject javaProject = JavaCore.create(project); - try { - setJavaNature(project); - } catch (CoreException ce) { - throw new RuntimeException(ce); - } - - javaProject.setOption(JavaCore.COMPILER_COMPLIANCE, JavaCore.VERSION_1_5); - javaProject.setOption(JavaCore.COMPILER_CODEGEN_TARGET_PLATFORM, JavaCore.VERSION_1_5); - javaProject.setOption(JavaCore.COMPILER_SOURCE, JavaCore.VERSION_1_5); - return javaProject; - } - - private void setJavaNature(IProject project) throws CoreException { - IProjectDescription description = project.getDescription(); - description.setNatureIds(new String[] { JavaCore.NATURE_ID }); - project.setDescription(description, null); - } - - - private IPackageFragmentRoot createSourceFolder(IProject project, - IJavaProject javaProject) throws CoreException { - IFolder folder = project.getFolder(SRC_FOLDER); - if (!folder.exists()){ - folder.create(false, true, null); - IPackageFragmentRoot root = javaProject.getPackageFragmentRoot(folder); - /*IClasspathEntry[] newEntries = { JavaCore - .newSourceEntry(root.getPath()) , JavaCore - .newContainerEntry(JRE_CONTAINER)}; - javaProject.setRawClasspath(newEntries, null);*/ - return root; - } - return javaProject.getPackageFragmentRoot(folder); - } - - - /*private boolean removePackage(String name, IProject project, IJavaProject javaProject) { IFolder folder = project.getFolder("src"); Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/ProjectUtil.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/ProjectUtil.java 2008-09-16 13:45:34 UTC (rev 10252) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/ProjectUtil.java 2008-09-16 14:41:40 UTC (rev 10253) @@ -113,7 +113,7 @@ public void run() throws CoreException { IPath cfgFilePath = new Path(MappingTestProject.PROJECT_NAME + "/" + //$NON-NLS-1$ - MappingTestProject.SRC_FOLDER + "/" + ProjectUtil.CFG_FILE_NAME); //$NON-NLS-1$ + TestUtilsCommon.SRC_FOLDER + "/" + ProjectUtil.CFG_FILE_NAME); //$NON-NLS-1$ createConsoleConfiguration(null, null, ConsoleCFGName, ConsoleConfigurationPreferences.ConfigurationMode.CORE, MappingTestProject.PROJECT_NAME, true, "", //$NON-NLS-1$ null, cfgFilePath, new Path[0], new Path[0], "", "", new NullProgressMonitor()); //$NON-NLS-1$//$NON-NLS-2$ Added: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/TestUtilsCommon.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/TestUtilsCommon.java (rev 0) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/TestUtilsCommon.java 2008-09-16 14:41:40 UTC (rev 10253) @@ -0,0 +1,250 @@ +/******************************************************************************* + * Copyright (c) 2007-2008 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.hibernate.eclipse.console.test.mappingproject; + +import java.io.File; +import java.io.FileFilter; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IFolder; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IProjectDescription; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.IWorkspace; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.Path; +import org.eclipse.jdt.core.IClasspathEntry; +import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.jdt.core.IPackageFragmentRoot; +import org.eclipse.jdt.core.JavaCore; +import org.eclipse.jdt.core.JavaModelException; +import org.eclipse.osgi.util.NLS; +import org.hibernate.eclipse.console.test.ConsoleTestMessages; + +/** + * + * + * @author Vitali + */ +public class TestUtilsCommon { + + public static final String SRC_FOLDER = "src"; //$NON-NLS-1$ + public static final String LIB_FOLDER = "lib"; //$NON-NLS-1$ + + public static final Path JRE_CONTAINER = new Path( + "org.eclipse.jdt.launching.JRE_CONTAINER"); //$NON-NLS-1$ + + protected FileFilter fileFilter = new FileFilter() { + public boolean accept(File pathname) { + return !pathname.isDirectory(); + } + }; + + protected FileFilter dirFilter = new FileFilter() { + public boolean accept(File pathname) { + // exclude ".svn" and other unnessesary folders + if (pathname.getName().charAt(0) == '.') + return false; + if (LIB_FOLDER.equals(pathname.getName())) + return false; + return pathname.isDirectory(); + } + }; + + protected FileFilter jarFilter = new FileFilter() { + public boolean accept(File pathname) { + return !pathname.isDirectory() + || pathname.getName().endsWith(".jar"); //$NON-NLS-1$ + } + }; + + public FileFilter getFileFilter() { + return fileFilter; + } + + public void setFileFilter(FileFilter fileFilter) { + this.fileFilter = fileFilter; + } + + public FileFilter getDirFilter() { + return dirFilter; + } + + public void setDirFilter(FileFilter dirFilter) { + this.dirFilter = dirFilter; + } + + public FileFilter getJarFilter() { + return jarFilter; + } + + public void setJarFilter(FileFilter jarFilter) { + this.jarFilter = jarFilter; + } + + public void recursiveCopyFiles(File src, IFolder dst) { + File[] files = src.listFiles(fileFilter); + for (int i = 0; i < files.length; i++) { + File file = files[i]; + if (!file.exists()) + continue; + IFile iFile = dst.getFile(file.getName()); + try { + iFile.create(new FileInputStream(file), true, null); + } catch (FileNotFoundException e) { + e.printStackTrace(); + continue; + } catch (CoreException e) { + e.printStackTrace(); + continue; + } + } + + File[] dirs = src.listFiles(dirFilter); + for (int i = 0; i < dirs.length; i++) { + File dir = dirs[i]; + if (!dir.exists()) + continue; + IFolder iFolder = dst.getFolder(dir.getName()); + try { + iFolder.create(true, true, null); + recursiveCopyFiles(dir, iFolder); + } catch (CoreException e) { + e.printStackTrace(); + continue; + } + } + } + + public IProject buildNewProject(String projectName) { + // get a project handle + final IProject newProjectHandle = ResourcesPlugin.getWorkspace() + .getRoot().getProject(projectName); + + // get a project descriptor + IWorkspace workspace = ResourcesPlugin.getWorkspace(); + final IProjectDescription description = workspace + .newProjectDescription(newProjectHandle.getName()); + + try { + createAndOpenProject(description, newProjectHandle); + } catch (CoreException ce) { + throw new RuntimeException(ce); + } + + return newProjectHandle; + } + + public void createAndOpenProject(IProjectDescription description, + IProject projectHandle) throws CoreException { + + projectHandle.create(description, null); + projectHandle.open(IResource.BACKGROUND_REFRESH, null); + } + + public IJavaProject buildJavaProject(IProject project) { + IJavaProject javaProject = JavaCore.create(project); + try { + setJavaNature(project); + } catch (CoreException ce) { + throw new RuntimeException(ce); + } + + javaProject.setOption(JavaCore.COMPILER_COMPLIANCE, + JavaCore.VERSION_1_5); + javaProject.setOption(JavaCore.COMPILER_CODEGEN_TARGET_PLATFORM, + JavaCore.VERSION_1_5); + javaProject.setOption(JavaCore.COMPILER_SOURCE, JavaCore.VERSION_1_5); + return javaProject; + } + + public void setJavaNature(IProject project) throws CoreException { + IProjectDescription description = project.getDescription(); + description.setNatureIds(new String[] { JavaCore.NATURE_ID }); + project.setDescription(description, null); + } + + public IPackageFragmentRoot createFolder(IProject project, + IJavaProject javaProject, String strFolder) throws CoreException { + IFolder folder = project.getFolder(strFolder); + if (!folder.exists()) { + folder.create(false, true, null); + IPackageFragmentRoot root = javaProject + .getPackageFragmentRoot(folder); + /* + * IClasspathEntry[] newEntries = { JavaCore + * .newSourceEntry(root.getPath()) , JavaCore + * .newContainerEntry(JRE_CONTAINER)}; + * javaProject.setRawClasspath(newEntries, null); + */ + return root; + } + return javaProject.getPackageFragmentRoot(folder); + } + + public IPackageFragmentRoot createSourceFolder(IProject project, + IJavaProject javaProject) throws CoreException { + return createFolder(project, javaProject, SRC_FOLDER); + } + + public List<IPath> copyLibs(IProject project, IJavaProject javaProject, + File res) throws CoreException { + IFolder dst = project.getFolder(TestUtilsCommon.LIB_FOLDER); + if (!dst.exists()) { + dst.create(false, true, null); + javaProject.getPackageFragmentRoot(dst); + } + File libFolder = new File(res.getAbsolutePath() + + "/" + TestUtilsCommon.LIB_FOLDER); //$NON-NLS-1$ + if (!libFolder.exists()) { + String out = NLS.bind( + ConsoleTestMessages.MappingTestProject_folder_not_found, + res.getAbsolutePath() + "/" + TestUtilsCommon.LIB_FOLDER); //$NON-NLS-1$ + throw new RuntimeException(out); + } + List<IPath> libs = new ArrayList<IPath>(); + + File[] files = libFolder.listFiles(jarFilter); + for (int i = 0; i < files.length; i++) { + File file = files[i]; + if (!file.exists()) + continue; + IFile iFile = dst.getFile(file.getName()); + try { + iFile.create(new FileInputStream(file), true, null); + libs.add(iFile.getFullPath()); + } catch (FileNotFoundException e) { + e.printStackTrace(); + continue; + } + } + return libs; + } + + public void generateClassPath(IJavaProject javaProject, List<IPath> libs, + IPackageFragmentRoot sourceFolder) throws JavaModelException { + List<IClasspathEntry> entries = new ArrayList<IClasspathEntry>(); + // entries.addAll(Arrays.asList(javaProject.getRawClasspath())); + for (IPath lib_path : libs) { + entries.add(JavaCore.newLibraryEntry(lib_path, null, null)); + } + entries.add(JavaCore.newSourceEntry(sourceFolder.getPath())); + entries.add(JavaCore.newContainerEntry(JRE_CONTAINER)); + javaProject.setRawClasspath(entries.toArray(new IClasspathEntry[0]), + null); + } +}

16 years

1
0
0 / 0

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

by jbosstools-commits＠lists.jboss.org

Author: mareshkau Date: 2008-09-16 09:45:34 -0400 (Tue, 16 Sep 2008) New Revision: 10252 Removed: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/parsers/ColorParserListener.java Log: =JBIDE-2521 Deleted: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/parsers/ColorParserListener.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/parsers/ColorParserListener.java 2008-09-16 13:42:48 UTC (rev 10251) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/parsers/ColorParserListener.java 2008-09-16 13:45:34 UTC (rev 10252) @@ -1,50 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.jst.jsp.outline.cssdialog.parsers; - -import java.util.HashMap; - -import org.xml.sax.Attributes; -import org.xml.sax.helpers.DefaultHandler; - -/** - * Color parser listener - * - * @author ezheleznyakov - * - */ -public class ColorParserListener extends DefaultHandler { - - private static String NODE_NAME_COLOR = "color"; - - private static String NODE_ATTRIBUTE_NAME = "name"; - - private static String NODE_ATTRIBUTE_VALUE = "value"; - - private static HashMap<String, String> map; - - public ColorParserListener() { - map = new HashMap<String, String>(); - } - - public void startElement(String uri, String localName, String nodeName, - Attributes attrs) { - - if (nodeName.trim().equalsIgnoreCase(NODE_NAME_COLOR)) { - map.put(attrs.getValue(NODE_ATTRIBUTE_NAME).trim().toUpperCase(), - attrs.getValue(NODE_ATTRIBUTE_VALUE).trim()); - } - } - - public static HashMap<String, String> getMap() { - return map; - } -} \ No newline at end of file

16 years

1
0
0 / 0

JBoss Tools SVN: r10251 - in trunk/jst/plugins/org.jboss.tools.jst.jsp: src/org/jboss/tools/jst/jsp/outline/cssdialog and 4 other directories.

by jbosstools-commits＠lists.jboss.org

Author: mareshkau Date: 2008-09-16 09:42:48 -0400 (Tue, 16 Sep 2008) New Revision: 10251 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSDialog.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/Util.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/events/TabPropertySheetMouseAdapter.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/parsers/ColorParser.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabBackgroundControl.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabBoxesControl.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabQuickEditControl.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabTextControl.java Log: JBIDE-2521 some code adjustment Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF 2008-09-16 13:20:22 UTC (rev 10250) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF 2008-09-16 13:42:48 UTC (rev 10251) @@ -14,6 +14,7 @@ org.jboss.tools.jst.jsp.editor, org.jboss.tools.jst.jsp.jspeditor, org.jboss.tools.jst.jsp.outline, + org.jboss.tools.jst.jsp.outline.cssdialog.common, org.jboss.tools.jst.jsp.preferences, org.jboss.tools.jst.jsp.support.kb, org.jboss.tools.jst.jsp.text, @@ -58,4 +59,5 @@ org.eclipse.core.runtime, org.eclipse.ui.views Bundle-Version: 2.0.0 +Export-Package: org.jboss.tools.jst.jsp.outline.cssdialog.parsers Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSDialog.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSDialog.java 2008-09-16 13:20:22 UTC (rev 10250) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSDialog.java 2008-09-16 13:42:48 UTC (rev 10251) @@ -34,8 +34,6 @@ import org.jboss.tools.jst.jsp.outline.cssdialog.common.MessageUtil; import org.jboss.tools.jst.jsp.outline.cssdialog.parsers.BaseListener; import org.jboss.tools.jst.jsp.outline.cssdialog.parsers.CSSElementsParser; -import org.jboss.tools.jst.jsp.outline.cssdialog.parsers.ColorParser; -import org.jboss.tools.jst.jsp.outline.cssdialog.parsers.ColorParserListener; import org.jboss.tools.jst.jsp.outline.cssdialog.parsers.ComboParser; import org.jboss.tools.jst.jsp.outline.cssdialog.parsers.Parser; import org.jboss.tools.jst.jsp.outline.cssdialog.parsers.ParserListener; @@ -142,11 +140,6 @@ }); cssParser.parse(); - ColorParserListener colorListener = new ColorParserListener(); - ColorParser colorParser = new ColorParser(); - colorParser.setListener(colorListener); - colorParser.parse(); - } /** Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/Util.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/Util.java 2008-09-16 13:20:22 UTC (rev 10250) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/Util.java 2008-09-16 13:42:48 UTC (rev 10251) @@ -14,9 +14,8 @@ import java.util.HashMap; import java.util.Set; import java.util.StringTokenizer; - import org.eclipse.swt.graphics.RGB; -import org.jboss.tools.jst.jsp.outline.cssdialog.parsers.ColorParserListener; +import org.jboss.tools.jst.jsp.outline.cssdialog.parsers.ColorParser; /** * @@ -27,13 +26,13 @@ */ public class Util { - private static String RGB = "rgb"; + private static String RGB = "rgb"; //$NON-NLS-1$ - private static String NONE = "none"; + private static String NONE = "none"; //$NON-NLS-1$ - private static String THIN = "thin"; + private static String THIN = "thin"; //$NON-NLS-1$ - private static String COMMA = ","; + private static String COMMA = ","; //$NON-NLS-1$ private static int START_INDEX_RED = 1; private static int END_INDEX_RED = 3; @@ -57,9 +56,9 @@ private static char CLOSE_BRACKET = '}'; private static char SHARP = '#'; - private static String SHARP_STRING = "#"; + private static String SHARP_STRING = "#"; //$NON-NLS-1$ - private static String ZERO_STR = "0"; + private static String ZERO_STR = "0"; //$NON-NLS-1$ private static int NORMAL_MIN_VALUE = 10; /** @@ -190,7 +189,7 @@ if (j == COUNT_COLORS) return convertColorRGB(color); } else { - HashMap<String, String> colorMap = ColorParserListener.getMap(); + HashMap<String, String> colorMap = ColorParser.getInstance().getMap(); for (String key : colorMap.keySet()) if (colorMap.get(key).equalsIgnoreCase(color)) @@ -319,8 +318,8 @@ : Constants.EMPTY_STRING) + Integer.toHexString(rgb.blue); colorStr = colorStr.toUpperCase(); - if (ColorParserListener.getMap().get(colorStr) != null) - return ColorParserListener.getMap().get(colorStr); + if (ColorParser.getInstance().getMap().get(colorStr) != null) + return ColorParser.getInstance().getMap().get(colorStr); return colorStr; } } \ No newline at end of file Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/events/TabPropertySheetMouseAdapter.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/events/TabPropertySheetMouseAdapter.java 2008-09-16 13:20:22 UTC (rev 10250) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/events/TabPropertySheetMouseAdapter.java 2008-09-16 13:42:48 UTC (rev 10251) @@ -45,7 +45,6 @@ import org.eclipse.ui.IFileEditorInput; import org.eclipse.ui.model.WorkbenchContentProvider; import org.eclipse.ui.model.WorkbenchLabelProvider; - import org.jboss.tools.jst.jsp.JspEditorPlugin; import org.jboss.tools.jst.jsp.outline.cssdialog.CSSDialog; import org.jboss.tools.jst.jsp.outline.cssdialog.FontFamilyDialog; @@ -55,7 +54,7 @@ import org.jboss.tools.jst.jsp.outline.cssdialog.common.ImageCombo; import org.jboss.tools.jst.jsp.outline.cssdialog.common.MessageUtil; import org.jboss.tools.jst.jsp.outline.cssdialog.common.Util; -import org.jboss.tools.jst.jsp.outline.cssdialog.parsers.ColorParserListener; +import org.jboss.tools.jst.jsp.outline.cssdialog.parsers.ColorParser; import org.jboss.tools.jst.jsp.outline.cssdialog.tabs.TabPropertySheetControl; /** @@ -163,7 +162,7 @@ // create combo for color colorCombo = new ImageCombo(panel, SWT.BORDER); - HashMap<String, String> colorMap = ColorParserListener.getMap(); + HashMap<String, String> colorMap = ColorParser.getInstance().getMap(); for (String key : colorMap.keySet()) { RGB rgb = Util.getColor(key); @@ -208,7 +207,7 @@ button.getImage().dispose(); } }); - btn.setToolTipText(MessageUtil.getString("COLOR_DIALOG_TITLE")); + btn.setToolTipText(MessageUtil.getString("COLOR_DIALOG_TITLE")); //$NON-NLS-1$ btn.addSelectionListener(new SelectionAdapter() { @@ -223,15 +222,15 @@ ColorDialog colorDialog = new ColorDialog(tree.getShell()); colorDialog.setRGB(startRgb); colorDialog.setText(MessageUtil - .getString("COLOR_DIALOG_TITLE")); + .getString("COLOR_DIALOG_TITLE")); //$NON-NLS-1$ RGB rgb = colorDialog.open(); if (rgb != null) { String str = Util.createColorString(rgb); - if (ColorParserListener.getMap().get(str) != null) + if (ColorParser.getInstance().getMap().get(str) != null) item.setText(Constants.SECOND_COLUMN, - ColorParserListener.getMap().get(str)); + ColorParser.getInstance().getMap().get(str)); else item.setText(Constants.SECOND_COLUMN, str); @@ -258,7 +257,7 @@ button.getImage().dispose(); } }); - btn.setToolTipText(MessageUtil.getString("IMAGE_DIALOG_MESSAGE")); + btn.setToolTipText(MessageUtil.getString("IMAGE_DIALOG_MESSAGE")); //$NON-NLS-1$ btn.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent event) { @@ -269,11 +268,11 @@ new WorkbenchContentProvider()); dialog .setTitle(MessageUtil - .getString("IMAGE_DIALOG_TITLE")); + .getString("IMAGE_DIALOG_TITLE")); //$NON-NLS-1$ dialog.setMessage(MessageUtil - .getString("IMAGE_DIALOG_MESSAGE")); + .getString("IMAGE_DIALOG_MESSAGE")); //$NON-NLS-1$ dialog.setEmptyListMessage(MessageUtil - .getString("IMAGE_DIALOG_EMPTY_MESSAGE")); + .getString("IMAGE_DIALOG_EMPTY_MESSAGE")); //$NON-NLS-1$ dialog.setAllowMultiple(false); dialog.setInput(project); if (dialog.open() == ImageSelectionDialog.OK) { @@ -390,7 +389,7 @@ button.getImage().dispose(); } }); - btn.setToolTipText(MessageUtil.getString("FONT_FAMILY_TIP")); + btn.setToolTipText(MessageUtil.getString("FONT_FAMILY_TIP")); //$NON-NLS-1$ btn.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent event) { Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/parsers/ColorParser.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/parsers/ColorParser.java 2008-09-16 13:20:22 UTC (rev 10250) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/parsers/ColorParser.java 2008-09-16 13:42:48 UTC (rev 10251) @@ -12,69 +12,99 @@ import java.io.IOException; import java.io.InputStream; +import java.util.HashMap; import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; import org.jboss.tools.jst.jsp.JspEditorPlugin; +import org.xml.sax.Attributes; import org.xml.sax.SAXException; +import org.xml.sax.helpers.DefaultHandler; /** * * Parser for parse colors elements * + * --==Singleton==-- + * * @author Evgeny Zheleznyakov - * + * */ public class ColorParser { - private String FILE_NAME = "cssdialog/colors.xml"; - - private ColorParserListener listener; - private SAXParserFactory fact; private SAXParser saxParser; + + private HashMap<String, String> map; + + private static ColorParser colorParser = null; + + private static final String NODE_NAME_COLOR = "color"; //$NON-NLS-1$ + private static final String NODE_ATTRIBUTE_NAME = "name"; //$NON-NLS-1$ + + private static final String NODE_ATTRIBUTE_VALUE = "value"; //$NON-NLS-1$ + + private static final String FILE_NAME = "cssdialog/colors.xml"; //$NON-NLS-1$ + + public static synchronized ColorParser getInstance() { + + if(colorParser==null) { + colorParser = new ColorParser(); + } + return colorParser; + } /** * Constructor for Color parser */ - public ColorParser() { + private ColorParser() { - try { - fact = SAXParserFactory.newInstance(); - saxParser = fact.newSAXParser(); + try { + fact = SAXParserFactory.newInstance(); + saxParser = fact.newSAXParser(); + } catch (ParserConfigurationException e) { + JspEditorPlugin.getPluginLog().logError(e); + } catch (SAXException e) { + JspEditorPlugin.getPluginLog().logError(e); + } - } catch (ParserConfigurationException e) { - JspEditorPlugin.getPluginLog().logError(e); - } catch (SAXException e) { - JspEditorPlugin.getPluginLog().logError(e); - } + parse(); } /** * Parse the content of the file specified as XML using the specified */ - public void parse() { - try { - InputStream is = JspEditorPlugin.getDefault().getBundle().getResource(FILE_NAME).openStream(); - saxParser.parse(is, listener); - } catch (SAXException e) { - JspEditorPlugin.getPluginLog().logError(e); - } catch (IOException e) { - JspEditorPlugin.getPluginLog().logError(e); + private void parse() { + + try { + InputStream is = JspEditorPlugin.getDefault().getBundle().getResource(FILE_NAME).openStream(); + saxParser.parse(is, new DefaultHandler() + { + public void startElement(String uri, String localName, String nodeName, + Attributes attrs) { + + if (nodeName.trim().equalsIgnoreCase(NODE_NAME_COLOR)) { + getMap().put(attrs.getValue(NODE_ATTRIBUTE_NAME).trim().toUpperCase(), + attrs.getValue(NODE_ATTRIBUTE_VALUE).trim()); + } + } + }); + } catch (SAXException e) { + JspEditorPlugin.getPluginLog().logError(e); + } catch (IOException e) { + JspEditorPlugin.getPluginLog().logError(e); + } + } + /** + * @return the map + */ + public HashMap<String, String> getMap() { + if(map==null) { + map = new HashMap<String, String>(); + } + return map; } - - } - - /** - * Method for set listener - * - * @param listener - * ColorParseListener - */ - public void setListener(ColorParserListener listener) { - this.listener = listener; - } -} \ No newline at end of file +} Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabBackgroundControl.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabBackgroundControl.java 2008-09-16 13:20:22 UTC (rev 10250) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabBackgroundControl.java 2008-09-16 13:42:48 UTC (rev 10251) @@ -15,7 +15,6 @@ import java.util.Map; import java.util.Set; import java.util.Map.Entry; - import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.jface.resource.ImageDescriptor; @@ -48,8 +47,9 @@ import org.jboss.tools.jst.jsp.outline.cssdialog.common.ImageCombo; import org.jboss.tools.jst.jsp.outline.cssdialog.common.MessageUtil; import org.jboss.tools.jst.jsp.outline.cssdialog.common.Util; -import org.jboss.tools.jst.jsp.outline.cssdialog.parsers.ColorParserListener; +import org.jboss.tools.jst.jsp.outline.cssdialog.parsers.ColorParser; + /** * Class for creating control in Background tab * @@ -83,13 +83,13 @@ Label label = new Label(this, SWT.LEFT); label.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false)); - label.setText(MessageUtil.getString("BACKGROUND_COLOR")); + label.setText(MessageUtil.getString("BACKGROUND_COLOR")); //$NON-NLS-1$ colorCombo = new ImageCombo(this, SWT.BORDER); colorCombo.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false)); // //////////////////////////////////////////////////////////////////////// - Set<Entry<String, String>> set = ColorParserListener.getMap() + Set<Entry<String, String>> set = ColorParser.getInstance().getMap() .entrySet(); for (Map.Entry<String, String> me : set) { @@ -113,7 +113,7 @@ Button button = new Button(this, SWT.PUSH); button.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false)); - button.setToolTipText(MessageUtil.getString("BACKGROUND_COLOR_TIP")); + button.setToolTipText(MessageUtil.getString("BACKGROUND_COLOR_TIP")); //$NON-NLS-1$ ImageDescriptor colorDesc = JspEditorPlugin .getImageDescriptor(Constants.IMAGE_COLORLARGE_FILE_LOCATION); Image im = colorDesc.createImage(); @@ -132,7 +132,7 @@ .setRGB(Util.getColor((colorCombo.getText().trim())) == null ? new RGB( 0, 0, 0) : Util.getColor((colorCombo.getText().trim()))); - dlg.setText(MessageUtil.getString("COLOR_DIALOG_TITLE")); + dlg.setText(MessageUtil.getString("COLOR_DIALOG_TITLE")); //$NON-NLS-1$ RGB rgb = dlg.open(); if (rgb != null) { String colorStr = Util.createColorString(rgb); @@ -144,7 +144,7 @@ label = new Label(this, SWT.LEFT); label.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false)); - label.setText(MessageUtil.getString("BACKGROUND_IMAGE")); + label.setText(MessageUtil.getString("BACKGROUND_IMAGE")); //$NON-NLS-1$ backgroundImageCombo = new Combo(this, SWT.BORDER); final GridData backgroundImageGridData = new GridData(GridData.FILL, @@ -168,7 +168,7 @@ button = new Button(this, SWT.PUSH); button.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false)); - button.setToolTipText(MessageUtil.getString("BACKGROUND_IMAGE")); + button.setToolTipText(MessageUtil.getString("BACKGROUND_IMAGE")); //$NON-NLS-1$ ImageDescriptor imageDesc = JspEditorPlugin .getImageDescriptor(Constants.IMAGE_FOLDERLARGE_FILE_LOCATION); Image image = imageDesc.createImage(); @@ -185,12 +185,12 @@ ImageSelectionDialog dialog = new ImageSelectionDialog( getShell(), new WorkbenchLabelProvider(), new WorkbenchContentProvider()); - dialog.setTitle(MessageUtil.getString("IMAGE_DIALOG_TITLE")); + dialog.setTitle(MessageUtil.getString("IMAGE_DIALOG_TITLE")); //$NON-NLS-1$ dialog .setMessage(MessageUtil - .getString("IMAGE_DIALOG_MESSAGE")); + .getString("IMAGE_DIALOG_MESSAGE")); //$NON-NLS-1$ dialog.setEmptyListMessage(MessageUtil - .getString("IMAGE_DIALOG_EMPTY_MESSAGE")); + .getString("IMAGE_DIALOG_EMPTY_MESSAGE")); //$NON-NLS-1$ dialog.setAllowMultiple(false); dialog.setInput(project); if (dialog.open() == ImageSelectionDialog.OK) { @@ -205,7 +205,7 @@ label = new Label(this, SWT.LEFT); label.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false)); - label.setText(MessageUtil.getString("BACKGROUND_REPEAT")); + label.setText(MessageUtil.getString("BACKGROUND_REPEAT")); //$NON-NLS-1$ backgroundRepeatCombo = new Combo(this, SWT.BORDER); backgroundRepeatCombo.setLayoutData(new GridData(GridData.FILL, Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabBoxesControl.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabBoxesControl.java 2008-09-16 13:20:22 UTC (rev 10250) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabBoxesControl.java 2008-09-16 13:42:48 UTC (rev 10251) @@ -15,7 +15,6 @@ import java.util.Map; import java.util.Set; import java.util.Map.Entry; - import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.JFaceResources; import org.eclipse.swt.SWT; @@ -42,8 +41,9 @@ import org.jboss.tools.jst.jsp.outline.cssdialog.common.ImageCombo; import org.jboss.tools.jst.jsp.outline.cssdialog.common.MessageUtil; import org.jboss.tools.jst.jsp.outline.cssdialog.common.Util; -import org.jboss.tools.jst.jsp.outline.cssdialog.parsers.ColorParserListener; +import org.jboss.tools.jst.jsp.outline.cssdialog.parsers.ColorParser; + /** * Class for creating control in Box tab * @@ -96,9 +96,9 @@ label.setFont(JFaceResources.getFontRegistry().get( JFaceResources.BANNER_FONT)); - label.setText(MessageUtil.getString("DIMENSION_TITLE")); + label.setText(MessageUtil.getString("DIMENSION_TITLE")); //$NON-NLS-1$ label = new Label(this, SWT.LEFT); - label.setText(MessageUtil.getString("WIDTH")); + label.setText(MessageUtil.getString("WIDTH")); //$NON-NLS-1$ label.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false)); @@ -154,7 +154,7 @@ } label = new Label(this, SWT.LEFT); - label.setText(MessageUtil.getString("HEIGHT")); + label.setText(MessageUtil.getString("HEIGHT")); //$NON-NLS-1$ label.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false)); @@ -213,12 +213,12 @@ false, false, 3, 1)); label.setFont(JFaceResources.getFontRegistry().get( JFaceResources.BANNER_FONT)); - label.setText(MessageUtil.getString("BORDER_TITLE")); + label.setText(MessageUtil.getString("BORDER_TITLE")); //$NON-NLS-1$ label = new Label(this, SWT.LEFT); label.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false)); - label.setText(MessageUtil.getString("BORDER_STYLE")); + label.setText(MessageUtil.getString("BORDER_STYLE")); //$NON-NLS-1$ borderStyleCombo = new Combo(this, SWT.BORDER); @@ -252,7 +252,7 @@ label = new Label(this, SWT.LEFT); label.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false)); - label.setText(MessageUtil.getString("BORDER_COLOR")); + label.setText(MessageUtil.getString("BORDER_COLOR")); //$NON-NLS-1$ borderColorCombo = new ImageCombo(this, SWT.BORDER); @@ -273,7 +273,7 @@ borderColorCombo.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false)); - Set<Entry<String, String>> set = ColorParserListener.getMap() + Set<Entry<String, String>> set = ColorParser.getInstance().getMap() .entrySet(); for (Map.Entry<String, String> me : set) { @@ -284,7 +284,7 @@ final Button button = new Button(this, SWT.PUSH); button.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false)); - button.setToolTipText(MessageUtil.getString("BORDER_COLOR_TIP")); + button.setToolTipText(MessageUtil.getString("BORDER_COLOR_TIP")); //$NON-NLS-1$ ImageDescriptor colorDesc = JspEditorPlugin .getImageDescriptor(Constants.IMAGE_COLORLARGE_FILE_LOCATION); Image im = colorDesc.createImage(); @@ -303,7 +303,7 @@ .setRGB(Util.getColor((borderColorCombo.getText() .trim())) == null ? Constants.RGB_BLACK : Util .getColor((borderColorCombo.getText().trim()))); - dlg.setText(MessageUtil.getString("COLOR_DIALOG_TITLE")); + dlg.setText(MessageUtil.getString("COLOR_DIALOG_TITLE")); //$NON-NLS-1$ RGB rgb = dlg.open(); if (rgb != null) { String colorStr = Util.createColorString(rgb); @@ -313,7 +313,7 @@ }); label = new Label(this, SWT.LEFT); - label.setText(MessageUtil.getString("BORDER_WIDTH")); + label.setText(MessageUtil.getString("BORDER_WIDTH")); //$NON-NLS-1$ label.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false)); @@ -412,10 +412,10 @@ false, false, 3, 1)); label.setFont(JFaceResources.getFontRegistry().get( JFaceResources.BANNER_FONT)); - label.setText(MessageUtil.getString("MARGIN_PADDING_TITLE")); + label.setText(MessageUtil.getString("MARGIN_PADDING_TITLE")); //$NON-NLS-1$ label = new Label(this, SWT.LEFT); - label.setText(MessageUtil.getString("MARGIN")); + label.setText(MessageUtil.getString("MARGIN")); //$NON-NLS-1$ label.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false)); @@ -471,7 +471,7 @@ } label = new Label(this, SWT.LEFT); - label.setText(MessageUtil.getString("PADDING")); + label.setText(MessageUtil.getString("PADDING")); //$NON-NLS-1$ label.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false)); Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabQuickEditControl.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabQuickEditControl.java 2008-09-16 13:20:22 UTC (rev 10250) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabQuickEditControl.java 2008-09-16 13:42:48 UTC (rev 10251) @@ -14,7 +14,6 @@ import java.util.Collections; import java.util.HashMap; import java.util.StringTokenizer; - import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.jface.resource.ImageDescriptor; @@ -50,8 +49,9 @@ import org.jboss.tools.jst.jsp.outline.cssdialog.common.ImageCombo; import org.jboss.tools.jst.jsp.outline.cssdialog.common.MessageUtil; import org.jboss.tools.jst.jsp.outline.cssdialog.common.Util; -import org.jboss.tools.jst.jsp.outline.cssdialog.parsers.ColorParserListener; +import org.jboss.tools.jst.jsp.outline.cssdialog.parsers.ColorParser; + /** * * Class for creating control in Quick edit tab @@ -61,10 +61,10 @@ */ public class TabQuickEditControl extends Composite { - private static String COLON_STRING = ":"; - private static String SPACE_STRING = " "; + private static String COLON_STRING = ":"; //$NON-NLS-1$ + private static String SPACE_STRING = " "; //$NON-NLS-1$ - private static String DASH_STRING = "-"; + private static String DASH_STRING = "-"; //$NON-NLS-1$ private static int FIRST_INDEX = 0; private static int SECOND_INDEX = 1; @@ -148,7 +148,7 @@ .getImageDescriptor(Constants.IMAGE_COLOR_FILE_LOCATION); Image colorImage = imageDes.createImage(); btn.setImage(colorImage); - btn.setToolTipText(MessageUtil.getString("COLOR_DIALOG_TITLE")); + btn.setToolTipText(MessageUtil.getString("COLOR_DIALOG_TITLE")); //$NON-NLS-1$ btn.addDisposeListener(new DisposeListener() { public void widgetDisposed(DisposeEvent e) { Button button = (Button) e.getSource(); @@ -169,14 +169,14 @@ .getShell()); colorDialog.setRGB(startRgb); colorDialog.setText(MessageUtil - .getString("COLOR_DIALOG_TITLE")); + .getString("COLOR_DIALOG_TITLE")); //$NON-NLS-1$ RGB rgb = colorDialog.open(); if (rgb != null) { String str = Util.createColorString(rgb); - if (ColorParserListener.getMap().get(str) != null) - colorCombo.setText(ColorParserListener.getMap() + if (ColorParser.getInstance().getMap().get(str) != null) + colorCombo.setText(ColorParser.getInstance().getMap() .get(str)); else colorCombo.setText(str); @@ -200,7 +200,7 @@ } }); - HashMap<String, String> colorMap = ColorParserListener.getMap(); + HashMap<String, String> colorMap = ColorParser.getInstance().getMap(); for (String key : colorMap.keySet()) { RGB rgb = Util.getColor(key); @@ -231,7 +231,7 @@ button.getImage().dispose(); } }); - btn.setToolTipText(MessageUtil.getString("COLOR_DIALOG_TITLE")); + btn.setToolTipText(MessageUtil.getString("COLOR_DIALOG_TITLE")); //$NON-NLS-1$ ArrayList<String> list = comboMap.get(name); for (String str : list) combo.add(str); @@ -244,11 +244,11 @@ new WorkbenchContentProvider()); dialog .setTitle(MessageUtil - .getString("IMAGE_DIALOG_TITLE")); + .getString("IMAGE_DIALOG_TITLE")); //$NON-NLS-1$ dialog.setMessage(MessageUtil - .getString("IMAGE_DIALOG_MESSAGE")); + .getString("IMAGE_DIALOG_MESSAGE")); //$NON-NLS-1$ dialog.setEmptyListMessage(MessageUtil - .getString("IMAGE_DIALOG_EMPTY_MESSAGE")); + .getString("IMAGE_DIALOG_EMPTY_MESSAGE")); //$NON-NLS-1$ dialog.setAllowMultiple(false); dialog.setInput(project); if (dialog.open() == ImageSelectionDialog.OK) { @@ -408,7 +408,7 @@ .getImageDescriptor(Constants.IMAGE_FONT_FILE_LOCATION); Image fontImage = imageDes.createImage(); btn.setImage(fontImage); - btn.setToolTipText(MessageUtil.getString("FONT_FAMILY_TIP")); + btn.setToolTipText(MessageUtil.getString("FONT_FAMILY_TIP")); //$NON-NLS-1$ btn.addDisposeListener(new DisposeListener() { public void widgetDisposed(DisposeEvent e) { Button button = (Button) e.getSource(); Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabTextControl.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabTextControl.java 2008-09-16 13:20:22 UTC (rev 10250) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabTextControl.java 2008-09-16 13:42:48 UTC (rev 10251) @@ -15,7 +15,6 @@ import java.util.Map; import java.util.Set; import java.util.Map.Entry; - import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.window.Window; import org.eclipse.swt.SWT; @@ -43,8 +42,9 @@ import org.jboss.tools.jst.jsp.outline.cssdialog.common.ImageCombo; import org.jboss.tools.jst.jsp.outline.cssdialog.common.MessageUtil; import org.jboss.tools.jst.jsp.outline.cssdialog.common.Util; -import org.jboss.tools.jst.jsp.outline.cssdialog.parsers.ColorParserListener; +import org.jboss.tools.jst.jsp.outline.cssdialog.parsers.ColorParser; + /** * Class for creating Text tab controls * @@ -88,7 +88,7 @@ setLayout(gridLayout); Label label = new Label(this, SWT.LEFT); - label.setText(MessageUtil.getString("FONT_FAMILY")); + label.setText(MessageUtil.getString("FONT_FAMILY")); //$NON-NLS-1$ label.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false)); @@ -112,7 +112,7 @@ Button button = new Button(this, SWT.PUSH); button.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false)); - button.setToolTipText(MessageUtil.getString("FONT_FAMILY_TIP")); + button.setToolTipText(MessageUtil.getString("FONT_FAMILY_TIP")); //$NON-NLS-1$ ImageDescriptor fontDesc = JspEditorPlugin .getImageDescriptor(Constants.IMAGE_FONTLARGE_FILE_LOCATION); Image fontImage = fontDesc.createImage(); @@ -135,7 +135,7 @@ label = new Label(this, SWT.LEFT); label.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false)); - label.setText(MessageUtil.getString("COLOR")); + label.setText(MessageUtil.getString("COLOR")); //$NON-NLS-1$ colorCombo = new ImageCombo(this, SWT.BORDER); colorCombo.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, @@ -156,7 +156,7 @@ //////////////////////////////////////////////////////////////////////// // // - Set<Entry<String, String>> set = ColorParserListener.getMap() + Set<Entry<String, String>> set = ColorParser.getInstance().getMap() .entrySet(); for (Map.Entry<String, String> me : set) { @@ -169,7 +169,7 @@ button = new Button(this, SWT.PUSH); button.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false)); - button.setToolTipText(MessageUtil.getString("COLOR_TIP")); + button.setToolTipText(MessageUtil.getString("COLOR_TIP")); //$NON-NLS-1$ ImageDescriptor colorDesc = JspEditorPlugin .getImageDescriptor(Constants.IMAGE_COLORLARGE_FILE_LOCATION); Image im = colorDesc.createImage(); @@ -187,7 +187,7 @@ dlg .setRGB(Util.getColor((colorCombo.getText().trim())) == null ? Constants.RGB_BLACK : Util.getColor((colorCombo.getText().trim()))); - dlg.setText(MessageUtil.getString("COLOR_DIALOG_TITLE")); + dlg.setText(MessageUtil.getString("COLOR_DIALOG_TITLE")); //$NON-NLS-1$ RGB rgb = dlg.open(); if (rgb != null) { String colorStr = Util.createColorString(rgb); @@ -199,7 +199,7 @@ label = new Label(this, SWT.LEFT); label.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false)); - label.setText(MessageUtil.getString("FONT_SIZE")); + label.setText(MessageUtil.getString("FONT_SIZE")); //$NON-NLS-1$ fontSizeCombo = new Combo(this, SWT.BORDER | SWT.SINGLE); @@ -275,7 +275,7 @@ label = new Label(this, SWT.LEFT); label.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false)); - label.setText(MessageUtil.getString("FONT_STYLE")); + label.setText(MessageUtil.getString("FONT_STYLE")); //$NON-NLS-1$ fontStyleCombo = new Combo(this, SWT.BORDER); @@ -308,7 +308,7 @@ label = new Label(this, SWT.LEFT); label.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false)); - label.setText(MessageUtil.getString("FONT_WEIGHT")); + label.setText(MessageUtil.getString("FONT_WEIGHT")); //$NON-NLS-1$ fontWeigthCombo = new Combo(this, SWT.BORDER); @@ -341,7 +341,7 @@ label = new Label(this, SWT.LEFT); label.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false)); - label.setText(MessageUtil.getString("TEXT_DECORATION")); + label.setText(MessageUtil.getString("TEXT_DECORATION")); //$NON-NLS-1$ textDecorationCombo = new Combo(this, SWT.BORDER); @@ -374,7 +374,7 @@ label = new Label(this, SWT.LEFT); label.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false)); - label.setText(MessageUtil.getString("TEXT_ALIGN")); + label.setText(MessageUtil.getString("TEXT_ALIGN")); //$NON-NLS-1$ textAlignCombo = new Combo(this, SWT.BORDER);

16 years

1
0
0 / 0

JBoss Tools SVN: r10250 - trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit.

by jbosstools-commits＠lists.jboss.org

Author: dazarov Date: 2008-09-16 09:20:22 -0400 (Tue, 16 Sep 2008) New Revision: 10250 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ParamListEditPart.java Log: https://jira.jboss.org/jira/browse/JBIDE-2770 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ParamListEditPart.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ParamListEditPart.java 2008-09-16 09:33:47 UTC (rev 10249) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ParamListEditPart.java 2008-09-16 13:20:22 UTC (rev 10250) @@ -87,7 +87,10 @@ protected void refreshVisuals() { Point loc = getPageWrapperModel().getPage().getLocation().getCopy(); - loc.y += 25+getPageWrapperModel().getPage().getOutputLinks().size()*NodeFigure.LINK_HEIGHT; + int links = getPageWrapperModel().getPage().getOutputLinks().size(); + if(links == 0) + links = 1; + loc.y += 25+links*NodeFigure.LINK_HEIGHT; size = new Dimension(200, getPageWrapperModel().getPage().getChildren().size()*19); adjustForGrid(loc);

16 years

1
0
0 / 0

JBoss Tools SVN: r10249 - trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/analyzer.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2008-09-16 05:33:47 -0400 (Tue, 16 Sep 2008) New Revision: 10249 Modified: trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java Log: change the save logic Modified: trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2008-09-16 09:33:46 UTC (rev 10248) +++ trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2008-09-16 09:33:47 UTC (rev 10249) @@ -104,7 +104,7 @@ } public void analyzeGraphicalModel(AbstractStructuredDataModel root, - SmooksResourceListType resouceList) { + List resouceList) { List children = root.getChildren(); for (Iterator iterator = children.iterator(); iterator.hasNext();) { @@ -151,7 +151,7 @@ * @param beanId */ protected void analyzeStructuredDataModel( - SmooksResourceListType resourceList, + List resourceList, AbstractStructuredDataModel root, AbstractStructuredDataModel dataModel, ResourceConfigType parentResourceConfigType, String beanId) { @@ -186,15 +186,15 @@ ResourceConfigType resourceConfig = SmooksFactory.eINSTANCE .createResourceConfigType(); - - Command addResourceConfigCommand = AddCommand - .create( - editingDomain, - resourceList, - SmooksPackage.eINSTANCE - .getSmooksResourceListType_AbstractResourceConfig(), - resourceConfig); - addResourceConfigCommand.execute(); + resourceList.add(resourceConfig); +// Command addResourceConfigCommand = AddCommand +// .create( +// editingDomain, +// resourceList, +// SmooksPackage.eINSTANCE +// .getSmooksResourceListType_AbstractResourceConfig(), +// resourceConfig); +// addResourceConfigCommand.execute(); // resouceConfig. resourceConfig .setSelector(getSourceBeanSelectorString((AbstractStructuredDataModel) source)); @@ -356,7 +356,7 @@ throws SmooksAnalyzerException { GraphRootModel root = context.getDataMappingRootModel(); SmooksResourceListType listType = context.getSmooksResourceListModel(); - this.analyzeGraphicalModel(root, listType); + this.analyzeGraphicalModel(root, context.getGeneratorResourceList()); } public MappingResourceConfigList analyzeMappingSmooksModel(

16 years

1
0
0 / 0

JBoss Tools SVN: r10248 - in trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks: ui and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2008-09-16 05:33:46 -0400 (Tue, 16 Sep 2008) New Revision: 10248 Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/BeanPopulatorWarrper.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/DateTypeWarrper.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/ResourceConfigWarrper.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DateTypeDetailPage.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ResourceConfigWarrperFactory.java Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/SmooksFileBuilder.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/AbstractSmooksModelDetailPage.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/BeanPopulatorDetailPage.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksResourceConfigFormBlock.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/modelparser/SmooksConfigurationFileGenerateContext.java Log: Add a new DetailPage for DateTypeDecrator Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/SmooksFileBuilder.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/SmooksFileBuilder.java 2008-09-16 09:06:33 UTC (rev 10247) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/SmooksFileBuilder.java 2008-09-16 09:33:46 UTC (rev 10248) @@ -4,20 +4,39 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; +import java.util.ArrayList; import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.emf.common.command.BasicCommandStack; +import org.eclipse.emf.common.command.Command; +import org.eclipse.emf.common.command.CommandStack; import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.emf.edit.command.AddCommand; +import org.eclipse.emf.edit.command.RemoveCommand; +import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; +import org.eclipse.emf.edit.domain.EditingDomain; +import org.eclipse.emf.edit.provider.ComposedAdapterFactory; +import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory; import org.jboss.tools.smooks.ui.modelparser.SmooksConfigurationFileGenerateContext; import org.milyn.xsd.smooks.DocumentRoot; import org.milyn.xsd.smooks.SmooksFactory; +import org.milyn.xsd.smooks.SmooksPackage; import org.milyn.xsd.smooks.SmooksResourceListType; -import org.milyn.xsd.smooks.util.SmooksResourceFactoryImpl; +import org.milyn.xsd.smooks.provider.SmooksItemProviderAdapterFactory; public class SmooksFileBuilder { Resource smooksResource; + EditingDomain domain; + public SmooksFileBuilder(EditingDomain domain) { + this.domain = domain; + } + public Resource getSmooksResource() { return smooksResource; } @@ -41,32 +60,74 @@ + " and the targetID : " + context.getTargetDataTypeID()); } - if(smooksResource == null) { + if (smooksResource == null) { throw new SmooksAnalyzerException("SmooksResource is NULL"); } - DocumentRoot documentRoot = (DocumentRoot)smooksResource.getContents().get(0); - if(documentRoot == null){ + DocumentRoot documentRoot = (DocumentRoot) smooksResource.getContents() + .get(0); + if (documentRoot == null) { documentRoot = SmooksFactory.eINSTANCE.createDocumentRoot(); smooksResource.getContents().add(documentRoot); } - + SmooksResourceListType listType = documentRoot.getSmooksResourceList(); - if(listType == null){ + if (listType == null) { listType = SmooksFactory.eINSTANCE.createSmooksResourceListType(); documentRoot.setSmooksResourceList(listType); } // init the smooksresourcelist initSmooksParseStyle(context, listType); + context.setGeneratorResourceList(new ArrayList()); + context.setSmooksResourceListModel(listType); + context.setDomain(domain); - context.setSmooksResourceListModel(listType); analyzer.analyzeMappingGraphModel(context); + insertResoureConfig(listType, context.getGeneratorResourceList()); + + List test = listType.getAbstractResourceConfig(); + ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); smooksResource.save(outputStream, Collections.EMPTY_MAP); return new ByteArrayInputStream(outputStream.toByteArray()); } + private EditingDomain createEditingDomain() { + ComposedAdapterFactory adapterFactory = new ComposedAdapterFactory( + ComposedAdapterFactory.Descriptor.Registry.INSTANCE); + adapterFactory + .addAdapterFactory(new ResourceItemProviderAdapterFactory()); + adapterFactory + .addAdapterFactory(new SmooksItemProviderAdapterFactory()); + + AdapterFactoryEditingDomain editingDomain = new AdapterFactoryEditingDomain( + adapterFactory, createCommandStack(), + new HashMap<Resource, Boolean>()); + + return editingDomain; + } + + protected CommandStack createCommandStack() { + return new BasicCommandStack(); + } + + protected void insertResoureConfig(SmooksResourceListType list, + List resourceConfigList) { + EditingDomain domain = createEditingDomain(); + int length = resourceConfigList.size(); + List kk = list.getAbstractResourceConfig(); + for (int i = length - 1; i >= 0; i--) { + Object obj = resourceConfigList.get(i); + Command addResourceConfigCommand = AddCommand + .create( + domain, + list,SmooksPackage.eINSTANCE.getSmooksResourceListType_AbstractResourceConfig(), + obj); + addResourceConfigCommand.execute(); + } + } + /** * * <code> <resource-config selector="global-parameters"> Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/BeanPopulatorWarrper.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/BeanPopulatorWarrper.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/BeanPopulatorWarrper.java 2008-09-16 09:33:46 UTC (rev 10248) @@ -0,0 +1,31 @@ +/******************************************************************************* + * Copyright (c) 2008 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.ui; + +import org.milyn.xsd.smooks.ResourceConfigType; + +/** + * @author Dart Peng + * Date : Sep 16, 2008 + */ +public class BeanPopulatorWarrper extends ResourceConfigWarrper { + + public BeanPopulatorWarrper() { + super(); + // TODO Auto-generated constructor stub + } + + public BeanPopulatorWarrper(ResourceConfigType type) { + super(type); + // TODO Auto-generated constructor stub + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/BeanPopulatorWarrper.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/DateTypeWarrper.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/DateTypeWarrper.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/DateTypeWarrper.java 2008-09-16 09:33:46 UTC (rev 10248) @@ -0,0 +1,31 @@ +/******************************************************************************* + * Copyright (c) 2008 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.ui; + +import org.milyn.xsd.smooks.ResourceConfigType; + +/** + * @author Dart Peng + * Date : Sep 16, 2008 + */ +public class DateTypeWarrper extends ResourceConfigWarrper { + + public DateTypeWarrper() { + super(); + // TODO Auto-generated constructor stub + } + + public DateTypeWarrper(ResourceConfigType type) { + super(type); + // TODO Auto-generated constructor stub + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/DateTypeWarrper.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/ResourceConfigWarrper.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/ResourceConfigWarrper.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/ResourceConfigWarrper.java 2008-09-16 09:33:46 UTC (rev 10248) @@ -0,0 +1,37 @@ +/******************************************************************************* + * Copyright (c) 2008 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.ui; + +import org.milyn.xsd.smooks.ResourceConfigType; + +/** + * @author Dart Peng + * Date : Sep 16, 2008 + */ +public class ResourceConfigWarrper { + private ResourceConfigType resourceConfig; + + public ResourceConfigWarrper(){ + + } + + public ResourceConfigWarrper(ResourceConfigType type){ + setResourceConfig(type); + } + + public ResourceConfigType getResourceConfig() { + return resourceConfig; + } + + public void setResourceConfig(ResourceConfigType resourceConfig) { + this.resourceConfig = resourceConfig; + } +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/ResourceConfigWarrper.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/AbstractSmooksModelDetailPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/AbstractSmooksModelDetailPage.java 2008-09-16 09:06:33 UTC (rev 10247) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/AbstractSmooksModelDetailPage.java 2008-09-16 09:33:46 UTC (rev 10248) @@ -20,6 +20,7 @@ import org.eclipse.ui.forms.IManagedForm; import org.eclipse.ui.forms.widgets.FormToolkit; import org.eclipse.ui.forms.widgets.Section; +import org.jboss.tools.smooks.ui.ResourceConfigWarrper; import org.milyn.xsd.smooks.ResourceConfigType; /** @@ -156,8 +157,14 @@ this.selection = selection; formPart = part; if (selection != null && selection instanceof IStructuredSelection) { - resourceConfigList = (ResourceConfigType) ((IStructuredSelection) selection) - .getFirstElement(); + Object obj = ((IStructuredSelection) selection) + .getFirstElement(); + if(obj instanceof ResourceConfigType){ + resourceConfigList = (ResourceConfigType)obj; + } + if(obj instanceof ResourceConfigWarrper){ + resourceConfigList = ((ResourceConfigWarrper)obj).getResourceConfig(); + } refresh(); } } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/BeanPopulatorDetailPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/BeanPopulatorDetailPage.java 2008-09-16 09:06:33 UTC (rev 10247) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/BeanPopulatorDetailPage.java 2008-09-16 09:33:46 UTC (rev 10248) @@ -10,6 +10,8 @@ ******************************************************************************/ package org.jboss.tools.smooks.ui.editors; +import org.eclipse.emf.common.command.Command; +import org.eclipse.emf.edit.command.SetCommand; import org.eclipse.emf.edit.domain.EditingDomain; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; @@ -21,6 +23,7 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Text; +import org.milyn.xsd.smooks.SmooksPackage; import org.milyn.xsd.smooks.util.SmooksModelUtils; /** @@ -75,7 +78,7 @@ gd.grabExcessHorizontalSpace = true; beanClassComposite.setLayoutData(gd); formToolKit.paintBordersFor(beanClassComposite); - + this.formToolKit.createLabel(parent, "Bean ID : "); Composite beanIDComposite = formToolKit.createComposite(parent); GridLayout bilg = new GridLayout(); @@ -107,8 +110,6 @@ protected void clazzBrowseButtonSelected() { } - - @Override public boolean isStale() { @@ -159,23 +160,27 @@ } private void configControls() { - + if (resourceConfigList != null) { String selector = ""; selector = resourceConfigList.getSelector(); if (selector == null) selector = ""; selectorText.setText(selector); - - String beanClass = SmooksModelUtils.getParmaText("beanClass", resourceConfigList); - if(beanClass == null) beanClass = ""; - String beanId = SmooksModelUtils.getParmaText("beanId", resourceConfigList); - if(beanId == null) beanId = ""; - + + String beanClass = SmooksModelUtils.getParmaText("beanClass", + resourceConfigList); + if (beanClass == null) + beanClass = ""; + String beanId = SmooksModelUtils.getParmaText("beanId", + resourceConfigList); + if (beanId == null) + beanId = ""; + beanClassText.setText(beanClass); beanIDText.setText(beanId); } - + } protected void beanIDChanged() { @@ -187,7 +192,15 @@ } protected void selectorChanged() { - + String selector = selectorText.getText(); + if (selector != null) { + Command command = SetCommand.create(this.getDomain(), resourceConfigList, + SmooksPackage.eINSTANCE.getResourceConfigType_Selector(), + selector); + getDomain().getCommandStack().execute(command); + } + // resourceConfigList.getResource() + // this.getDomain(). } } Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DateTypeDetailPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DateTypeDetailPage.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DateTypeDetailPage.java 2008-09-16 09:33:46 UTC (rev 10248) @@ -0,0 +1,83 @@ +/******************************************************************************* + * Copyright (c) 2008 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.ui.editors; + +import org.eclipse.emf.edit.domain.EditingDomain; +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Combo; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Text; +import org.milyn.xsd.smooks.util.SmooksModelUtils; + +/** + * @author Dart Peng + * Date : Sep 16, 2008 + */ +public class DateTypeDetailPage extends AbstractSmooksModelDetailPage { + + private Text formatText; + private Combo localeLangaugeCombo; + private Combo localeContryCombo; + + public DateTypeDetailPage(SmooksFormEditor parentEditor, + EditingDomain domain) { + super(parentEditor, domain); + // TODO Auto-generated constructor stub + } + + @Override + public boolean isStale() { + return true; + } + + @Override + public void refresh() { + if(this.resourceConfigList != null){ + String formate = SmooksModelUtils.getParmaText("format", resourceConfigList); + String locallang = SmooksModelUtils.getParmaText("Locale-Language", resourceConfigList); + String localcontry = SmooksModelUtils.getParmaText("Locale-Contry", resourceConfigList); + if(formate == null) formate = ""; + if(locallang == null) locallang = ""; + if(localcontry == null) localcontry = ""; + + + formatText.setText(formate); + localeContryCombo.setText(localcontry); + localeLangaugeCombo.setText(locallang); + } + } + + @Override + protected void createSectionContents(Composite parent) { + GridLayout layout = new GridLayout(); + layout.numColumns = 2; + parent.setLayout(layout); + this.formToolKit.createLabel(parent, "Format :"); + GridData gd = new GridData(GridData.FILL_HORIZONTAL); + formatText = this.formToolKit.createText(parent, ""); + formatText.setLayoutData(gd); + + this.formToolKit.createLabel(parent, "Locale-Language :"); + gd = new GridData(GridData.FILL_HORIZONTAL); + localeLangaugeCombo = new Combo(parent, SWT.FLAT); + localeLangaugeCombo.setLayoutData(gd); + + this.formToolKit.createLabel(parent, "Locale-Contry :"); + gd = new GridData(GridData.FILL_HORIZONTAL); + localeContryCombo = new Combo(parent, SWT.FLAT); + localeContryCombo.setLayoutData(gd); + + formToolKit.paintBordersFor(parent); + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DateTypeDetailPage.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ResourceConfigWarrperFactory.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ResourceConfigWarrperFactory.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ResourceConfigWarrperFactory.java 2008-09-16 09:33:46 UTC (rev 10248) @@ -0,0 +1,59 @@ +/******************************************************************************* + * Copyright (c) 2008 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.ui.editors; + +import org.jboss.tools.smooks.ui.BeanPopulatorWarrper; +import org.jboss.tools.smooks.ui.DateTypeWarrper; +import org.jboss.tools.smooks.ui.ResourceConfigWarrper; +import org.milyn.xsd.smooks.ResourceConfigType; +import org.milyn.xsd.smooks.ResourceType; +import org.milyn.xsd.smooks.util.SmooksConstants; + +/** + * @author Dart Peng + * Date : Sep 16, 2008 + */ +public class ResourceConfigWarrperFactory { + + + public static ResourceConfigWarrper createResourceConfigWarrper( + ResourceConfigType type) { + if (isBeanPopulatorResource(type)) { + BeanPopulatorWarrper p = new BeanPopulatorWarrper(type); + return p; + } + if(isDateTypeSelector(type)){ + DateTypeWarrper warrper = new DateTypeWarrper(type); + return warrper; + } + return null; + } + + public static boolean isBeanPopulatorResource(ResourceConfigType type) { + ResourceType resource = type.getResource(); + if (resource == null) + return false; + if (SmooksConstants.BEAN_POPULATOR.equals(resource.getValue())) { + return true; + } + return false; + } + + public static boolean isDateTypeSelector(ResourceConfigType type) { + ResourceType resource = type.getResource(); + if (resource == null) + return false; + if (SmooksConstants.DATE_DECODER.equals(resource.getValue())) { + return true; + } + return false; + } +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ResourceConfigWarrperFactory.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java 2008-09-16 09:06:33 UTC (rev 10247) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java 2008-09-16 09:33:46 UTC (rev 10248) @@ -226,9 +226,9 @@ } callParentRefillNormalModelInfor(); } - - private void callParentRefillNormalModelInfor(){ - SmooksFormEditor editor = (SmooksFormEditor)getEditor(); + + private void callParentRefillNormalModelInfor() { + SmooksFormEditor editor = (SmooksFormEditor) getEditor(); editor.refreshNormalPage(); } @@ -451,7 +451,7 @@ } protected SmooksFileBuilder createSmooksFileBulder() { - return new SmooksFileBuilder(); + return new SmooksFileBuilder(this.getEditingDomain()); } protected void initTargetTreeViewer() { @@ -1136,6 +1136,8 @@ * @return the editingDomain */ protected AdapterFactoryEditingDomain getEditingDomain() { + FormEditor parentEditor = this.getEditor(); + editingDomain = ((SmooksFormEditor) parentEditor).getEditingDomain(); return editingDomain; } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksResourceConfigFormBlock.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksResourceConfigFormBlock.java 2008-09-16 09:06:33 UTC (rev 10247) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksResourceConfigFormBlock.java 2008-09-16 09:33:46 UTC (rev 10248) @@ -15,7 +15,9 @@ import org.eclipse.emf.edit.domain.EditingDomain; import org.eclipse.jface.viewers.ISelectionChangedListener; +import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.SelectionChangedEvent; +import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.FillLayout; @@ -30,23 +32,32 @@ import org.eclipse.ui.forms.widgets.FormToolkit; import org.eclipse.ui.forms.widgets.Section; import org.jboss.tools.smooks.analyzer.NormalSmooksModelPackage; +import org.jboss.tools.smooks.ui.BeanPopulatorWarrper; +import org.jboss.tools.smooks.ui.DateTypeWarrper; +import org.jboss.tools.smooks.ui.ResourceConfigWarrper; import org.jboss.tools.smooks.ui.gef.util.GraphicsConstants; +import org.milyn.xsd.smooks.ResourceConfigType; import org.milyn.xsd.smooks.impl.ResourceConfigTypeImpl; /** * @author Dart Peng * Date : Sep 11, 2008 */ -public class SmooksResourceConfigFormBlock extends MasterDetailsBlock { +public class SmooksResourceConfigFormBlock extends MasterDetailsBlock implements + ISelectionChangedListener { TreeViewer dateTypeViewer; NormalSmooksModelPackage modelPackage = null; - + SmooksFormEditor parentEditor; - + + IManagedForm managedForm; + protected EditingDomain domain; + private SectionPart sectionPart; + public EditingDomain getDomain() { return domain; } @@ -71,6 +82,7 @@ */ @Override protected void createMasterPart(IManagedForm managedForm, Composite parent) { + this.managedForm = managedForm; FormToolkit tool = managedForm.getToolkit(); createDataTypeGUI(parent, tool, managedForm); configDateTypeViewer(); @@ -93,8 +105,10 @@ */ @Override protected void registerPages(DetailsPart detailsPart) { - detailsPart.registerPage(ResourceConfigTypeImpl.class, - new BeanPopulatorDetailPage(getParentEditor(),getDomain())); + detailsPart.registerPage(BeanPopulatorWarrper.class, + new BeanPopulatorDetailPage(getParentEditor(), getDomain())); + detailsPart.registerPage(DateTypeWarrper.class, + new DateTypeDetailPage(getParentEditor(), getDomain())); } protected void configDateTypeViewer() { @@ -122,8 +136,8 @@ Section section = tool.createSection(rootMainControl, Section.TITLE_BAR | Section.DESCRIPTION); section.setText("Data Type"); - final SectionPart spart = new SectionPart(section); - managedForm.addPart(spart); + sectionPart = new SectionPart(section); + managedForm.addPart(sectionPart); GridData gd = new GridData(GridData.FILL_HORIZONTAL); Composite dataTypeComposite = tool.createComposite(section); section.setClient(dataTypeComposite); @@ -139,15 +153,7 @@ fillLayout.marginWidth = 1; tableComposite.setLayout(fillLayout); dateTypeViewer = new TreeViewer(tableComposite, SWT.NONE); - dateTypeViewer - .addSelectionChangedListener(new ISelectionChangedListener() { - - public void selectionChanged(SelectionChangedEvent event) { - managedForm.fireSelectionChanged(spart, event - .getSelection()); - } - - }); + dateTypeViewer.addSelectionChangedListener(this); gd = new GridData(GridData.FILL_BOTH); tableComposite.setLayoutData(gd); tableComposite.setBackground(GraphicsConstants.groupBorderColor); @@ -183,4 +189,22 @@ this.parentEditor = parentEditor; } + public void selectionChanged(SelectionChangedEvent event) { + IStructuredSelection selection = (IStructuredSelection) event + .getSelection(); + if (selection.isEmpty()) + return; + Object obj = selection.getFirstElement(); + if (obj instanceof ResourceConfigType) { + ResourceConfigWarrper warrper = ResourceConfigWarrperFactory + .createResourceConfigWarrper((ResourceConfigType) obj); + if (warrper != null) { + selection = new StructuredSelection(warrper); + managedForm.fireSelectionChanged(sectionPart,selection); + return; + } + } + managedForm.fireSelectionChanged(sectionPart, event.getSelection()); + } + } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/modelparser/SmooksConfigurationFileGenerateContext.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/modelparser/SmooksConfigurationFileGenerateContext.java 2008-09-16 09:06:33 UTC (rev 10247) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/modelparser/SmooksConfigurationFileGenerateContext.java 2008-09-16 09:33:46 UTC (rev 10248) @@ -10,6 +10,10 @@ ******************************************************************************/ package org.jboss.tools.smooks.ui.modelparser; +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.emf.edit.domain.EditingDomain; import org.jboss.tools.smooks.graphical.Param; import org.jboss.tools.smooks.ui.gef.model.GraphRootModel; import org.milyn.xsd.smooks.SmooksResourceListType; @@ -25,7 +29,10 @@ protected String targetDataTypeID = null; protected GraphRootModel dataMappingRootModel; protected SmooksResourceListType smooksResourceListModel; + protected List generatorResourceList = new ArrayList(); + protected EditingDomain domain; + protected String smooksType = null; /** * @return the sourceDataTypeID @@ -90,5 +97,17 @@ public void addParam(Param param){ } + public EditingDomain getDomain() { + return domain; + } + public void setDomain(EditingDomain domain) { + this.domain = domain; + } + public List getGeneratorResourceList() { + return generatorResourceList; + } + public void setGeneratorResourceList(List generatorResourceList) { + this.generatorResourceList = generatorResourceList; + } }

16 years

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits September 2008