November 2008 - jbosstools-commits

JBoss Tools SVN: r11923 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2008-11-20 13:13:51 -0500 (Thu, 20 Nov 2008) New Revision: 11923 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java Log: https://jira.jboss.org/jira/browse/JBIDE-2729 Fixed. Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java 2008-11-20 17:47:49 UTC (rev 11922) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java 2008-11-20 18:13:51 UTC (rev 11923) @@ -117,7 +117,7 @@ if(isWarConfiguration(model)) { AntCopyUtils.copyFiles(seamHomeFolder, webLibFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_WAR_LIB_FILESET_WAR_CONFIG).dir(seamHomeFolder))); AntCopyUtils.copyFiles(seamLibFolder, webLibFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_WAR_LIB_FILESET_WAR_CONFIG).dir(seamLibFolder))); - final IContainer source = srcRootFolder.getUnderlyingFolder(); + final IContainer source = warSrcRootFolder.getUnderlyingFolder(); File actionsSrc = new File(project.getLocation().toFile(), source.getFullPath().removeFirstSegments(1).toString()); AntCopyUtils.copyFileToFolder(new File(seamGenResFolder, "seam.properties"), actionsSrc, true); //$NON-NLS-1$ AntCopyUtils.copyFiles(droolsLibFolder, webLibFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_WAR_LIB_FILESET_WAR_CONFIG).dir(droolsLibFolder))); Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java 2008-11-20 17:47:49 UTC (rev 11922) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java 2008-11-20 18:13:51 UTC (rev 11923) @@ -277,7 +277,7 @@ } } - protected IVirtualFolder srcRootFolder; + protected IVirtualFolder warSrcRootFolder; protected File seamHomeFolder; protected String seamHomePath; protected File seamLibFolder; @@ -311,7 +311,7 @@ // get WebContents folder path from DWP model IVirtualComponent component = ComponentCore.createComponent(project); IVirtualFolder webRootVirtFolder = component.getRootFolder().getFolder(new Path("/")); //$NON-NLS-1$ - srcRootFolder = component.getRootFolder().getFolder(new Path("/WEB-INF/classes")); //$NON-NLS-1$ + warSrcRootFolder = component.getRootFolder().getFolder(new Path("/WEB-INF/classes")); //$NON-NLS-1$ webRootFolder = webRootVirtFolder.getUnderlyingFolder(); webContentFolder = webRootFolder.getLocation().toFile(); @@ -321,7 +321,7 @@ webInfClassesMetaInf = new File(webInfClasses, "META-INF"); //$NON-NLS-1$ webInfClassesMetaInf.mkdirs(); webLibFolder = new File(webContentFolder, WEB_LIBRARIES_RELATED_PATH); - srcFolder = isWarConfiguration(model) ? new File(srcRootFolder.getUnderlyingFolder().getLocation().toFile(), "model") : srcRootFolder.getUnderlyingFolder().getLocation().toFile(); //$NON-NLS-1$ + srcFolder = isWarConfiguration(model) ? new File(warSrcRootFolder.getUnderlyingFolder().getLocation().toFile(), "model") : warSrcRootFolder.getUnderlyingFolder().getLocation().toFile(); //$NON-NLS-1$ Object runtimeName = model.getProperty(ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME); if(runtimeName!=null) { copyFilesToWarProject(project, fv, model, monitor); @@ -394,6 +394,8 @@ hibernateDialectFilterSet.addFilterSet(projectFilterSet); hibernateDialectFilterSet.addFilterSet(SeamFacetFilterSetFactory.createHibernateDialectFilterSet(model)); + final IContainer source = warSrcRootFolder.getUnderlyingFolder(); + // ******************************************************************************************** // Handle WAR configurations // ******************************************************************************************** @@ -408,17 +410,15 @@ // Copy seam project indicator // ******************************************************************************************** - final IContainer source = srcRootFolder.getUnderlyingFolder(); - IPath actionSrcPath = new Path(source.getFullPath().removeFirstSegments(1) + "/action"); //$NON-NLS-1$ IPath modelSrcPath = new Path(source.getFullPath().removeFirstSegments(1) + "/model"); //$NON-NLS-1$ - srcRootFolder.delete(IVirtualFolder.FORCE, monitor); + warSrcRootFolder.delete(IVirtualFolder.FORCE, monitor); WtpUtils.createSourceFolder(project, actionSrcPath, source.getFullPath().removeFirstSegments(1), webRootFolder.getFullPath().removeFirstSegments(1).append("WEB-INF/dev")); //$NON-NLS-1$ WtpUtils.createSourceFolder(project, modelSrcPath, source.getFullPath().removeFirstSegments(1), null); - srcRootFolder.createLink(actionSrcPath, 0, null); - srcRootFolder.createLink(modelSrcPath, 0, null); + warSrcRootFolder.createLink(actionSrcPath, 0, null); + warSrcRootFolder.createLink(modelSrcPath, 0, null); File actionsSrc = new File(project.getLocation().toFile(), source.getFullPath().removeFirstSegments(1) + "/action/"); //$NON-NLS-1$ @@ -454,6 +454,7 @@ } else { // In case of EAR configuration AntCopyUtils.copyFileToFolder(new File(seamGenResFolder, "messages_en.properties"), srcFolder, false); //$NON-NLS-1$ + WtpUtils.createSourceFolder(project, source.getFullPath(), source.getFullPath().removeFirstSegments(1), webRootFolder.getFullPath().removeFirstSegments(1).append("WEB-INF/dev")); //$NON-NLS-1$ } }

17 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r11922 - in trunk/portlet/plugins/org.jboss.tools.portlet.core: META-INF and 3 other directories.

by jbosstools-commits＠lists.jboss.org

Author: snjeza Date: 2008-11-20 12:47:49 -0500 (Thu, 20 Nov 2008) New Revision: 11922 Added: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/PortletRuntimeComponentProvider.java trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/preferences/ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/preferences/JBossPortletPreferencesInitializer.java Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/META-INF/MANIFEST.MF trunk/portlet/plugins/org.jboss.tools.portlet.core/plugin.xml trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/PortletCoreActivator.java Log: JBIDE-2758 Seam project with Portlets facet enabled can't start in JBoss AS server Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/META-INF/MANIFEST.MF =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.core/META-INF/MANIFEST.MF 2008-11-20 17:47:23 UTC (rev 11921) +++ trunk/portlet/plugins/org.jboss.tools.portlet.core/META-INF/MANIFEST.MF 2008-11-20 17:47:49 UTC (rev 11922) @@ -19,7 +19,8 @@ org.eclipse.jst.common.frameworks, org.eclipse.ui.ide, org.eclipse.jem, - org.eclipse.jst.jsf.facesconfig + org.eclipse.jst.jsf.facesconfig, + org.eclipse.wst.server.core Bundle-ActivationPolicy: lazy Export-Package: org.jboss.tools.portlet.core, org.jboss.tools.portlet.core.internal, Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/plugin.xml =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.core/plugin.xml 2008-11-20 17:47:23 UTC (rev 11921) +++ trunk/portlet/plugins/org.jboss.tools.portlet.core/plugin.xml 2008-11-20 17:47:49 UTC (rev 11922) @@ -65,14 +65,15 @@ </dynamic-preset> </extension> --> - +  + <extension point="org.eclipse.wst.common.project.facet.core.listeners"> <listener @@ -144,12 +145,44 @@ </dynamic-preset> </extension> --> + <extension point="org.eclipse.wst.common.project.facet.core.runtimes"> + <runtime-component-type id="org.jboss.tools.portlet.core.runtime.component"/> + <runtime-component-version type="org.jboss.tools.portlet.core.runtime.component" version="1.0"/> + <supported> + <runtime-component id="org.jboss.tools.portlet.core.runtime.component" version="1.0"/> + <facet id="jboss.portlet" version="1.0,2.0"/> + <facet id="jboss.jsfportlet" version="1.0"/> + <facet id="jboss.seamportlet" version="1.0"/> + </supported> + </extension> + +  + + <extension point="org.eclipse.jst.server.core.internalRuntimeComponentProviders"> + <runtimeComponentProvider + id="org.jboss.tools.portlet.core.runtimes" + class="org.jboss.tools.portlet.core.internal.PortletRuntimeComponentProvider" + runtimeTypeIds="*"/> + </extension> + +  <extension point="org.eclipse.jdt.core.classpathContainerInitializer"> <classpathContainerInitializer class="org.jboss.tools.portlet.core.internal.JSFPortlet10LibrariesContainerInitializer" @@ -214,12 +247,14 @@ </dynamic-preset> </extension> --> +  <!-- <extension point="org.eclipse.jdt.core.classpathContainerInitializer"> @@ -263,4 +298,10 @@ <listener class="org.jboss.tools.portlet.core.internal.project.facet.PortletPostInstallListener" eventTypes="POST_INSTALL"/> </extension> + + <extension + point="org.eclipse.core.runtime.preferences"> + <initializer class="org.jboss.tools.portlet.core.preferences.JBossPortletPreferencesInitializer"/> + </extension> + </plugin> Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/PortletCoreActivator.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/PortletCoreActivator.java 2008-11-20 17:47:23 UTC (rev 11921) +++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/PortletCoreActivator.java 2008-11-20 17:47:49 UTC (rev 11922) @@ -33,6 +33,8 @@ public static final String PLUGIN_ID = "org.jboss.tools.portlet.core"; //$NON-NLS-1$ public static final String RESOURCES_FOLDER = "resources"; //$NON-NLS-1$ public static final String JSFPORTLET_FOLDER = "jsfportlet"; //$NON-NLS-1$ + public static final String CHECK_RUNTIMES = "checkRuntimes"; //$NON-NLS-1$ + public static final boolean DEFAULT_CHECK_RUNTIMES = true; public static final IOverwriteQuery OVERWRITE_ALL_QUERY = new IOverwriteQuery() { public String queryOverwrite(String pathString) { Added: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/PortletRuntimeComponentProvider.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/PortletRuntimeComponentProvider.java (rev 0) +++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/PortletRuntimeComponentProvider.java 2008-11-20 17:47:49 UTC (rev 11922) @@ -0,0 +1,89 @@ +package org.jboss.tools.portlet.core.internal; + +import java.io.File; +import java.io.FilenameFilter; +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.core.runtime.Platform; +import org.eclipse.wst.common.project.facet.core.runtime.IRuntimeComponent; +import org.eclipse.wst.common.project.facet.core.runtime.IRuntimeComponentType; +import org.eclipse.wst.common.project.facet.core.runtime.IRuntimeComponentVersion; +import org.eclipse.wst.common.project.facet.core.runtime.RuntimeManager; +import org.eclipse.wst.server.core.IRuntime; +import org.eclipse.wst.server.core.internal.facets.RuntimeFacetComponentProviderDelegate; +import org.jboss.tools.portlet.core.Messages; +import org.jboss.tools.portlet.core.PortletCoreActivator; + +public class PortletRuntimeComponentProvider extends + RuntimeFacetComponentProviderDelegate { + + private static final String SERVER_DEFAULT_DEPLOY_JBOSS_PORTAL_SAR = "server/default/deploy/jboss-portal.sar"; //$NON-NLS-1$ + + private static final String SERVER_DEFAULT_DEPLOY_SIMPLE_PORTAL = "server/default/deploy/simple-portal"; //$NON-NLS-1$ + + private static final String LIB = "lib"; //$NON-NLS-1$ + + private static final String JAR = ".jar"; //$NON-NLS-1$ + + private static final String PORTLET_API = "portlet-api"; //$NON-NLS-1$ + + private static final IRuntimeComponentType PORTAL_TYPE = RuntimeManager + .getRuntimeComponentType("org.jboss.tools.portlet.core.runtime.component"); //$NON-NLS-1$ + + private static final IRuntimeComponentVersion PORTAL_VERSION_1 = PORTAL_TYPE + .getVersion("1.0"); //$NON-NLS-1$ + + public List<IRuntimeComponent> getRuntimeComponents(final IRuntime runtime) { + final File location = runtime.getLocation().toFile(); + final List<IRuntimeComponent> components = new ArrayList<IRuntimeComponent>(); + if (isPortalPresent(location)) { + final IRuntimeComponent portalComponent = RuntimeManager + .createRuntimeComponent(PORTAL_VERSION_1, null); + components.add(portalComponent); + } + return components; + } + + + private static boolean isPortalPresent(final File location) { + boolean check = PortletCoreActivator.getDefault().getPluginPreferences().getBoolean(PortletCoreActivator.CHECK_RUNTIMES); + if (!check) { + return true; + } + // JBoss Portal server + if (exists(location, SERVER_DEFAULT_DEPLOY_JBOSS_PORTAL_SAR)) { + return true; + } + // JBoss portletcontainer + if (exists(location,SERVER_DEFAULT_DEPLOY_SIMPLE_PORTAL)) { + return true; + } + // Tomcat portletcontainer + File tomcatLib = new File(location,LIB); + if (tomcatLib.exists() && tomcatLib.isDirectory()) { + String[] files = tomcatLib.list(new FilenameFilter() { + + public boolean accept(File dir, String name) { + if (name.startsWith(PORTLET_API) && name.endsWith(JAR)) { + return true; + } + return false; + } + + }); + return files.length > 0; + } + + return false; + } + + + private static boolean exists(final File location,String portalDir) { + if (Platform.getOS().equals(Platform.OS_WIN32)) { + portalDir = portalDir.replace("/", "\\"); //$NON-NLS-1$ //$NON-NLS-2$ + } + File file = new File(location,portalDir); + return file.exists(); + } +} Added: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/preferences/JBossPortletPreferencesInitializer.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/preferences/JBossPortletPreferencesInitializer.java (rev 0) +++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/preferences/JBossPortletPreferencesInitializer.java 2008-11-20 17:47:49 UTC (rev 11922) @@ -0,0 +1,18 @@ +package org.jboss.tools.portlet.core.preferences; + +import org.eclipse.core.runtime.Preferences; +import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer; +import org.jboss.tools.portlet.core.PortletCoreActivator; + +public class JBossPortletPreferencesInitializer extends + AbstractPreferenceInitializer { + + @Override + public void initializeDefaultPreferences() { + Preferences preferences = PortletCoreActivator.getDefault().getPluginPreferences(); + preferences.setDefault( + PortletCoreActivator.CHECK_RUNTIMES, + PortletCoreActivator.DEFAULT_CHECK_RUNTIMES); + } + +}

17 years, 5 months

1
0
0 / 0

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

by jbosstools-commits＠lists.jboss.org

Author: snjeza Date: 2008-11-20 12:47:23 -0500 (Thu, 20 Nov 2008) New Revision: 11921 Added: trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/preferences/ trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/preferences/JBossPortletPreferencePage.java Modified: trunk/portlet/plugins/org.jboss.tools.portlet.ui/plugin.properties trunk/portlet/plugins/org.jboss.tools.portlet.ui/plugin.xml trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/Messages.java trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/messages.properties Log: JBIDE-2758 Seam project with Portlets facet enabled can't start in JBoss AS server Modified: trunk/portlet/plugins/org.jboss.tools.portlet.ui/plugin.properties =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.ui/plugin.properties 2008-11-20 17:46:26 UTC (rev 11920) +++ trunk/portlet/plugins/org.jboss.tools.portlet.ui/plugin.properties 2008-11-20 17:47:23 UTC (rev 11921) @@ -5,4 +5,5 @@ Java_portlet_wizard_name = Java Portlet Portlet_wizard_description = Create a new Java Portlet JSFSeam_portlet_wizard_name = JBoss JSF/Seam Portlet -JSFSeam_portlet_wizard_description = Create a new JBoss JSF Portlet \ No newline at end of file +JSFSeam_portlet_wizard_description = Create a new JBoss JSF Portlet +JBoss_Portlet = JBoss Portlet \ No newline at end of file Modified: trunk/portlet/plugins/org.jboss.tools.portlet.ui/plugin.xml =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.ui/plugin.xml 2008-11-20 17:46:26 UTC (rev 11920) +++ trunk/portlet/plugins/org.jboss.tools.portlet.ui/plugin.xml 2008-11-20 17:47:23 UTC (rev 11921) @@ -53,6 +53,16 @@ <selection class="org.eclipse.core.resources.IResource" /> </wizard> --> + </extension> - + + <extension + point="org.eclipse.ui.preferencePages"> + <page + category="org.jboss.tools.common.model.ui.MainPreferencePage" + class="org.jboss.tools.portlet.ui.internal.preferences.JBossPortletPreferencePage" + id="org.jboss.tools.portlet.core.ui.JBossPortletPreferencePage" + name="%JBoss_Portlet"/> + </extension> + </plugin> Modified: trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/Messages.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/Messages.java 2008-11-20 17:46:26 UTC (rev 11920) +++ trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/Messages.java 2008-11-20 17:47:23 UTC (rev 11921) @@ -4,6 +4,7 @@ public class Messages extends NLS { private static final String BUNDLE_NAME = "org.jboss.tools.portlet.ui.messages"; //$NON-NLS-1$ + public static String JBossPortletPreferencePage_Check_Runtimes_for_Portlet_Components; public static String AddPortletWizardPage_Edit; public static String AddPortletWizardPage_Help; public static String AddPortletWizardPage_Portlet_Modes; Added: trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/preferences/JBossPortletPreferencePage.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/preferences/JBossPortletPreferencePage.java (rev 0) +++ trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/preferences/JBossPortletPreferencePage.java 2008-11-20 17:47:23 UTC (rev 11921) @@ -0,0 +1,52 @@ +package org.jboss.tools.portlet.ui.internal.preferences; + +import org.eclipse.core.runtime.Preferences; +import org.eclipse.jface.preference.PreferencePage; +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.ui.IWorkbench; +import org.eclipse.ui.IWorkbenchPreferencePage; +import org.jboss.tools.portlet.ui.Messages; +import org.jboss.tools.portlet.core.PortletCoreActivator; + +public class JBossPortletPreferencePage extends PreferencePage implements + IWorkbenchPreferencePage { + + private IWorkbench workbench; + private Button button; + + @Override + protected Control createContents(Composite parent) { + Composite composite = new Composite(parent, SWT.NONE); + GridLayout layout = new GridLayout(1, false); + layout.marginWidth = 0; + layout.marginHeight = 0; + composite.setLayout(layout); + + button = new Button(composite,SWT.CHECK); + button.setText(Messages.JBossPortletPreferencePage_Check_Runtimes_for_Portlet_Components); + button.setSelection(PortletCoreActivator.getDefault().getPluginPreferences().getBoolean(PortletCoreActivator.CHECK_RUNTIMES)); + return composite; + } + + public void init(IWorkbench workbench) { + this.workbench = workbench; + } + + @Override + protected void performDefaults() { + button.setSelection(PortletCoreActivator.DEFAULT_CHECK_RUNTIMES); + super.performDefaults(); + } + + @Override + public boolean performOk() { + Preferences preferences = PortletCoreActivator.getDefault().getPluginPreferences(); + preferences.setDefault(PortletCoreActivator.CHECK_RUNTIMES, button.getSelection()); + return super.performOk(); + } + +} Modified: trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/messages.properties =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/messages.properties 2008-11-20 17:46:26 UTC (rev 11920) +++ trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/messages.properties 2008-11-20 17:47:23 UTC (rev 11921) @@ -43,4 +43,5 @@ NewPortletClassWizardPage_New_Portlet=New Portlet NewPortletClassWizardPage_Use_an_existing_Portlet_class=Use an existing Portlet class NewPortletWizard_Specify_modifiers_interfaces_to_implement_and_method_stubs_to_generate=Specify modifiers, interfaces to implement and method stubs to generate. -No_portlets_exist_to_add=No portlets exist to add \ No newline at end of file +No_portlets_exist_to_add=No portlets exist to add +JBossPortletPreferencePage_Check_Runtimes_for_Portlet_Components=Check Runtimes for Portlet Components

17 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r11920 - trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2008-11-20 12:46:26 -0500 (Thu, 20 Nov 2008) New Revision: 11920 Modified: trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/JobUtils.java Log: fix compilation error Modified: trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/JobUtils.java =================================================================== --- trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/JobUtils.java 2008-11-20 17:09:57 UTC (rev 11919) +++ trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/JobUtils.java 2008-11-20 17:46:26 UTC (rev 11920) @@ -21,15 +21,20 @@ public class JobUtils { private static final long MAX_IDLE = 30*60*1000L; + private static final long DEFAULT_DELAY = 500; public static void waitForIdle() { + waitForIdle(DEFAULT_DELAY); + } + + public static void waitForIdle(long delay) { long start = System.currentTimeMillis(); // Job.getJobManager().isIdle() is more efficient than EditorTestHelper.allJobsQuiet() // EditorTestHelper.allJobsQuiet() isn't thread-safe // https://bugs.eclipse.org/bugs/show_bug.cgi?id=198241 is fixed //while (!EditorTestHelper.allJobsQuiet()) { while (!Job.getJobManager().isIdle()) { - delay(500); + delay(delay); if ( (System.currentTimeMillis()-start) > MAX_IDLE ) throw new RuntimeException("A long running task detected"); //$NON-NLS-1$ }

17 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r11919 - in trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model: filesystems/impl and 3 other directories.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2008-11-20 12:09:57 -0500 (Thu, 20 Nov 2008) New Revision: 11919 Added: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/AuxiliaryLoader.java Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/FileAuxiliary.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FolderImpl.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/RegularObjectImpl.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelObjectImpl.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/markers/ConstraintChecker.java Log: JBIDE-3085 Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/FileAuxiliary.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/FileAuxiliary.java 2008-11-20 16:43:50 UTC (rev 11918) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/FileAuxiliary.java 2008-11-20 17:09:57 UTC (rev 11919) @@ -60,7 +60,9 @@ String auxname = aux.getAttributeValue("name"); if(replaceExtension) return auxname; int i = auxname.lastIndexOf('.'); - return (i < 0) ? auxname : auxname.substring(0, i); + String s = (i < 0) ? auxname : auxname.substring(0, i); + if(addLeadingDot && s.startsWith(".")) s = s.substring(1); + return s; } public String getAuxiliaryName(XModelObject main) { Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FolderImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FolderImpl.java 2008-11-20 16:43:50 UTC (rev 11918) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FolderImpl.java 2008-11-20 17:09:57 UTC (rev 11919) @@ -38,6 +38,7 @@ import org.jboss.tools.common.model.filesystems.XFileObject; import org.jboss.tools.common.model.impl.RegularObjectImpl; import org.jboss.tools.common.model.impl.XModelImpl; +import org.jboss.tools.common.model.loaders.AuxiliaryLoader; import org.jboss.tools.common.model.loaders.Reloadable; import org.jboss.tools.common.model.loaders.XObjectLoader; import org.jboss.tools.common.model.loaders.impl.PropertiesLoader; @@ -151,8 +152,23 @@ linkedResources.put(pp, rs[i]); _loadChild(peer, f); } + + bindAuxiliary(); + fire = true; } + + private void bindAuxiliary() { + XModelObject[] cs = getChildren(); + for (int i = 0; i < cs.length; i++) { + if(cs[i].getFileType() == XModelObject.FILE) { + XObjectLoader loader = XModelObjectLoaderUtil.getObjectLoader(cs[i]); + if(loader instanceof AuxiliaryLoader) { + ((AuxiliaryLoader)loader).bind(cs[i]); + } + } + } + } private void _loadChild(FileSystemPeer peer, File f) { if(f.isDirectory()) { @@ -327,6 +343,8 @@ String nm = (String)it.next(); updateRemove((XModelObject)toRemove.get(nm)); } + + bindAuxiliary(); } catch (NoClassDefFoundError error) { //Most probably Eclipse is shutting down. return true; @@ -1015,7 +1033,16 @@ public boolean write(Object object) { if(!(object instanceof XModelObject)) return false; XModelObject o = (XModelObject)object; - return XModelObjectLoaderUtil.saveBody(f, o, ResourcesPlugin.getEncoding()); + + boolean b = XModelObjectLoaderUtil.saveBody(f, o, ResourcesPlugin.getEncoding()); + + XModelObject p = o.getParent(); + while(p != null && p.getFileType() < XFileObject.FOLDER) p = p.getParent(); + if(p instanceof FolderImpl) { + ((FolderImpl)p).getFileSystem().getPeer().register(f); + } + + return b; } } Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/RegularObjectImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/RegularObjectImpl.java 2008-11-20 16:43:50 UTC (rev 11918) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/RegularObjectImpl.java 2008-11-20 17:09:57 UTC (rev 11919) @@ -57,6 +57,10 @@ return children.getObjects(); } + public XModelObject[] getLoadedChildren() { + return children.getObjects(); + } + public boolean addChild_0(XModelObject o) { if(o == null) { return false; Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelObjectImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelObjectImpl.java 2008-11-20 16:43:50 UTC (rev 11918) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelObjectImpl.java 2008-11-20 17:09:57 UTC (rev 11919) @@ -237,6 +237,10 @@ return getChildren(); } + public XModelObject[] getLoadedChildren() { + return getChildren(); + } + public XModelObject getChildAt(int i) { XModelObject[] children = getChildren(); return (i < 0 || i >= children.length) ? null : children[i]; Added: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/AuxiliaryLoader.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/AuxiliaryLoader.java (rev 0) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/AuxiliaryLoader.java 2008-11-20 17:09:57 UTC (rev 11919) @@ -0,0 +1,20 @@ +/******************************************************************************* + * Copyright (c) 2007 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.common.model.loaders; + +import org.jboss.tools.common.model.XModelObject; + +/** + * @author Viacheslav Kabanovich + */ +public interface AuxiliaryLoader { + public void bind(XModelObject main); +} Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/markers/ConstraintChecker.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/markers/ConstraintChecker.java 2008-11-20 16:43:50 UTC (rev 11918) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/markers/ConstraintChecker.java 2008-11-20 17:09:57 UTC (rev 11919) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.common.model.markers; +import org.jboss.tools.common.model.impl.XModelObjectImpl; import org.jboss.tools.common.model.markers.ResourceMarkers; import org.jboss.tools.common.meta.XAttribute; @@ -42,7 +43,7 @@ String error = as[i].getConstraint().getError(o.getAttributeValue(as[i].getName())); if(error != null) addProblem(o, as[i].getName(), "Value " + error); } - XModelObject[] cs = o.getChildrenForSave(); + XModelObject[] cs = ((XModelObjectImpl)o).getLoadedChildren(); for (int i = 0; i < cs.length; i++) check(cs[i]); }

17 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r11918 - in trunk: jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2008-11-20 11:43:50 -0500 (Thu, 20 Nov 2008) New Revision: 11918 Modified: trunk/common/tests/org.jboss.tools.common.test/src/org/jboss/tools/common/test/util/TestProjectProvider.java trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CommonContentAssistantTestCase.java trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1704Test.java trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1717Test.java trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1807Test.java trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1813Test.java trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide2437Test.java trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1585Test.java trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1641Test.java trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1759Test.java trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/StrutsJspJbide1648Test.java Log: Update for vpe.jst.jsp tests (unused packages were removed). TestProjectProvider dispose() methods logs exceptions happened during deleting project Modified: trunk/common/tests/org.jboss.tools.common.test/src/org/jboss/tools/common/test/util/TestProjectProvider.java =================================================================== --- trunk/common/tests/org.jboss.tools.common.test/src/org/jboss/tools/common/test/util/TestProjectProvider.java 2008-11-20 16:29:58 UTC (rev 11917) +++ trunk/common/tests/org.jboss.tools.common.test/src/org/jboss/tools/common/test/util/TestProjectProvider.java 2008-11-20 16:43:50 UTC (rev 11918) @@ -21,10 +21,13 @@ import org.eclipse.core.resources.IWorkspaceRunnable; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.ILog; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; +import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Status; import org.jboss.tools.common.util.FileUtil; import org.jboss.tools.test.util.JobUtils; @@ -73,18 +76,30 @@ return project; } - public void dispose() throws CoreException { - if(project == null || !project.exists()) return; - boolean oldAutoBuilding = true; + public void dispose() { + if (project == null || !project.exists()) { + return; + } try { - oldAutoBuilding = ResourcesUtils.setBuildAutomatically(false); - JobUtils.waitForIdle(); - project.close(null); - project.delete(true, null); - JobUtils.waitForIdle(); - } finally { - ResourcesUtils.setBuildAutomatically(oldAutoBuilding); - } + boolean oldAutoBuilding = true; + try { + oldAutoBuilding = ResourcesUtils.setBuildAutomatically(false); + JobUtils.waitForIdle(10); + project.close(null); + JobUtils.waitForIdle(10); + project.delete(true, null); + JobUtils.waitForIdle(10); + } finally { + ResourcesUtils.setBuildAutomatically(oldAutoBuilding); + } + } catch (CoreException ex) { + ILog log = Platform.getLog(Platform.getBundle("org.jboss.tools.common.test")); + IStatus error = new Status( + IStatus.ERROR, + "org.jboss.tools.common.test", + "Exception occurs during project deletion",ex); + log.log(error); + } } TestDescriptionFactory tests = null; Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CommonContentAssistantTestCase.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CommonContentAssistantTestCase.java 2008-11-20 16:29:58 UTC (rev 11917) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CommonContentAssistantTestCase.java 2008-11-20 16:43:50 UTC (rev 11918) @@ -13,8 +13,6 @@ package org.jboss.tools.jst.jsp.test.ca; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; import org.jboss.tools.common.test.util.TestProjectProvider; Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1704Test.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1704Test.java 2008-11-20 16:29:58 UTC (rev 11917) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1704Test.java 2008-11-20 16:43:50 UTC (rev 11918) @@ -3,22 +3,14 @@ import junit.framework.Test; import junit.framework.TestSuite; -import org.eclipse.core.resources.IResource; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.FindReplaceDocumentAdapter; import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.contentassist.ICompletionProposal; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; -import org.eclipse.swt.widgets.Display; -import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument; -import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion; -import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion; -import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList; -import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; import org.jboss.tools.common.test.util.TestProjectProvider; import org.jboss.tools.jst.jsp.contentassist.AutoContentAssistantProposal; import org.jboss.tools.jst.jsp.test.TestUtil; -import org.jboss.tools.test.util.JobUtils; public class JsfJspJbide1704Test extends ContentAssistantTestCase { TestProjectProvider provider = null; Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1717Test.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1717Test.java 2008-11-20 16:29:58 UTC (rev 11917) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1717Test.java 2008-11-20 16:43:50 UTC (rev 11918) @@ -5,7 +5,6 @@ import junit.framework.Test; import junit.framework.TestSuite; -import org.eclipse.core.resources.IResource; import org.eclipse.jface.text.contentassist.ICompletionProposal; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.wst.sse.ui.internal.contentassist.CustomCompletionProposal; Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1807Test.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1807Test.java 2008-11-20 16:29:58 UTC (rev 11917) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1807Test.java 2008-11-20 16:43:50 UTC (rev 11918) @@ -1,6 +1,5 @@ package org.jboss.tools.jst.jsp.test.ca; -import org.eclipse.core.resources.IResource; import org.jboss.tools.common.test.util.TestProjectProvider; public class JsfJspJbide1807Test extends ContentAssistantTestCase{ Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1813Test.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1813Test.java 2008-11-20 16:29:58 UTC (rev 11917) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1813Test.java 2008-11-20 16:43:50 UTC (rev 11918) @@ -1,6 +1,5 @@ package org.jboss.tools.jst.jsp.test.ca; -import org.eclipse.core.resources.IResource; import org.jboss.tools.common.test.util.TestProjectProvider; public class JsfJspJbide1813Test extends ContentAssistantTestCase{ Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide2437Test.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide2437Test.java 2008-11-20 16:29:58 UTC (rev 11917) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide2437Test.java 2008-11-20 16:43:50 UTC (rev 11918) @@ -3,17 +3,11 @@ import junit.framework.Test; import junit.framework.TestSuite; -import org.eclipse.core.resources.IResource; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.FindReplaceDocumentAdapter; import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.contentassist.ICompletionProposal; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; -import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument; -import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion; -import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion; -import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList; -import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; import org.jboss.tools.common.test.util.TestProjectProvider; import org.jboss.tools.jst.jsp.contentassist.AutoContentAssistantProposal; import org.jboss.tools.jst.jsp.test.TestUtil; @@ -41,11 +35,11 @@ public void testJsfJspJbide2437 () throws BadLocationException { openEditor(PAGE_NAME); - + JobUtils.waitForIdle(); ICompletionProposal[] result= null; String errorMessage = null; - IRegion reg = new FindReplaceDocumentAdapter(document).find(0, "/templates/common.xhtml", true, false, false, false); + IRegion reg = new FindReplaceDocumentAdapter(document).find(0, "/templates/common.xhtml", true, true, false, false); IContentAssistProcessor p= TestUtil.getProcessor(viewer, reg.getOffset(), contentAssistant); assertNotNull("Cannot obtain IContentAssistProcessor instance",p); Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1585Test.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1585Test.java 2008-11-20 16:29:58 UTC (rev 11917) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1585Test.java 2008-11-20 16:43:50 UTC (rev 11918) @@ -3,10 +3,8 @@ import junit.framework.Test; import junit.framework.TestSuite; -import org.eclipse.core.resources.IResource; import org.eclipse.jface.text.contentassist.ICompletionProposal; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; -import org.eclipse.ui.PlatformUI; import org.jboss.tools.common.test.util.TestProjectProvider; import org.jboss.tools.jst.jsp.contentassist.AutoContentAssistantProposal; import org.jboss.tools.jst.jsp.test.TestUtil; Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1641Test.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1641Test.java 2008-11-20 16:29:58 UTC (rev 11917) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1641Test.java 2008-11-20 16:43:50 UTC (rev 11918) @@ -3,7 +3,6 @@ import junit.framework.Test; import junit.framework.TestSuite; -import org.eclipse.core.resources.IResource; import org.eclipse.jface.text.contentassist.ICompletionProposal; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.jboss.tools.common.test.util.TestProjectProvider; Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1759Test.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1759Test.java 2008-11-20 16:29:58 UTC (rev 11917) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1759Test.java 2008-11-20 16:43:50 UTC (rev 11918) @@ -6,7 +6,6 @@ import junit.framework.Test; import junit.framework.TestSuite; -import org.eclipse.core.resources.IResource; import org.eclipse.jface.text.contentassist.ICompletionProposal; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.wst.sse.ui.internal.contentassist.CustomCompletionProposal; Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/StrutsJspJbide1648Test.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/StrutsJspJbide1648Test.java 2008-11-20 16:29:58 UTC (rev 11917) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/StrutsJspJbide1648Test.java 2008-11-20 16:43:50 UTC (rev 11918) @@ -3,7 +3,6 @@ import junit.framework.Test; import junit.framework.TestSuite; -import org.eclipse.core.resources.IResource; import org.eclipse.jface.text.contentassist.ICompletionProposal; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.jboss.tools.common.test.util.TestProjectProvider;

17 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r11917 - in trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces: src/org/jboss/tools/jsf/vpe/richfaces/template and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: dmaliarevich Date: 2008-11-20 11:29:58 -0500 (Thu, 20 Nov 2008) New Revision: 11917 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/dataTableScroller/dataTableScroller.css trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataTableScrollerTemplate.java Log: https://jira.jboss.org/jira/browse/JBIDE-2906, fecets proceccing was added. Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/dataTableScroller/dataTableScroller.css =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/dataTableScroller/dataTableScroller.css 2008-11-20 16:24:00 UTC (rev 11916) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/dataTableScroller/dataTableScroller.css 2008-11-20 16:29:58 UTC (rev 11917) @@ -1,6 +1,6 @@ .rich-datascr { - width : 400px; - display: table; + /*width : 600px; + display: table;*/ } .rich-dtascroller-table { background-color:#FFFFFF; Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataTableScrollerTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataTableScrollerTemplate.java 2008-11-20 16:24:00 UTC (rev 11916) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataTableScrollerTemplate.java 2008-11-20 16:29:58 UTC (rev 11917) @@ -14,6 +14,7 @@ import org.jboss.tools.jsf.vpe.richfaces.template.util.RichFaces; import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate; +import org.jboss.tools.vpe.editor.template.VpeChildrenInfo; import org.jboss.tools.vpe.editor.template.VpeCreationData; import org.jboss.tools.vpe.editor.util.Constants; import org.jboss.tools.vpe.editor.util.HTML; @@ -38,9 +39,9 @@ private static final String LEFT_SINGLE_SCROLL_SYMBOL = "�"; //$NON-NLS-1$ /* - * Minimal cells number in datascroller. + * Default cells number in datascroller. */ - private static final int MINIMAL_CELLS_NUMBER = 5; + private static final int DEFAULT_CELLS_NUMBER = 10; /* * Default active datascroller page number. */ @@ -69,6 +70,13 @@ private static final String ATTR_VALUE_SHOW = "show"; //$NON-NLS-1$ + private static final String FACET_FIRST = "first"; //$NON-NLS-1$ + private static final String FACET_LAST = "last"; //$NON-NLS-1$ + private static final String FACET_FAST_FORWARD = "fastforward"; //$NON-NLS-1$ + private static final String FACET_FAST_REWIND = "fastrewind"; //$NON-NLS-1$ + private static final String FACET_NEXT = "next"; //$NON-NLS-1$ + private static final String FACET_PREVIOUS = "previous"; //$NON-NLS-1$ + private boolean showBoundaryControls; private boolean showFastControls; private int maxPages; @@ -107,11 +115,16 @@ public VpeCreationData create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument) { readAttributes(sourceNode); + Element sourceElement = (Element) sourceNode; ComponentUtil.setCSSLink(pageContext, STYLE_PATH, COMPONENT_NAME); nsIDOMElement div = visualDocument.createElement(HTML.TAG_DIV); VpeCreationData creationData = new VpeCreationData(div); - + /* + * Adding fake children info to avoid creating pseudo element. + */ + creationData.addChildrenInfo(new VpeChildrenInfo(div)); + div.setAttribute(HTML.ATTR_ALIGN, HTML.VALUE_ALIGN_CENTER); div.setAttribute(HTML.ATTR_CLASS, styleClass); if (ComponentUtil.isNotBlank(style)) { @@ -137,18 +150,35 @@ /* * Create left side controls */ + Object object = null; + Element facetElement = null; if (showBoundaryControls) { - createCell(visualDocument, tr, LEFT_DOUBLE_SCROLL_SYMBOL, + object = LEFT_DOUBLE_SCROLL_SYMBOL; + facetElement = ComponentUtil.getFacetElement(sourceElement, FACET_FIRST); + if (null != facetElement) { + object = facetElement; + } + createCell(visualDocument, creationData, tr, object, CSS_RICH_DATASCR_BUTTON + Constants.WHITE_SPACE + CSS_RICH_DATASCR_BUTTON_DSBLD, Constants.EMPTY); } if (showFastControls) { - createCell(visualDocument, tr, LEFT_SINGLE_SCROLL_SYMBOL, + object = LEFT_SINGLE_SCROLL_SYMBOL; + facetElement = ComponentUtil.getFacetElement(sourceElement, FACET_FAST_REWIND); + if (null != facetElement) { + object = facetElement; + } + createCell(visualDocument, creationData, tr, object, CSS_RICH_DATASCR_BUTTON + Constants.WHITE_SPACE + CSS_RICH_DATASCR_BUTTON_DSBLD, Constants.EMPTY); } if (showStepControls) { - createCell(visualDocument, tr, Constants.EMPTY, + object = Constants.EMPTY; + facetElement = ComponentUtil.getFacetElement(sourceElement, FACET_PREVIOUS); + if (null != facetElement) { + object = facetElement; + } + createCell(visualDocument, creationData, tr, object, CSS_RICH_DATASCR_BUTTON + Constants.WHITE_SPACE + CSS_RICH_DATASCR_BUTTON_DSBLD, Constants.EMPTY); } @@ -157,7 +187,7 @@ * Create page numbers controls */ for (int i = 1; i <= maxPages; i++) { - createCell(visualDocument, tr, String.valueOf(i), + createCell(visualDocument, creationData, tr, String.valueOf(i), (i == 1 ? selectedStyleClass : inactiveStyleClass), (i == 1 ? selectedStyle : inactiveStyle)); } @@ -166,35 +196,42 @@ * Create right side controls */ if (showStepControls) { - createCell(visualDocument, tr, Constants.EMPTY, + object = Constants.EMPTY; + facetElement = ComponentUtil.getFacetElement(sourceElement, FACET_NEXT); + if (null != facetElement) { + object = facetElement; + } + createCell(visualDocument, creationData, tr, object, CSS_RICH_DATASCR_BUTTON, Constants.EMPTY); } if (showFastControls) { - createCell(visualDocument, tr, RIGHT_SINGLE_SCROLL_SYMBOL, + object = RIGHT_SINGLE_SCROLL_SYMBOL; + facetElement = ComponentUtil.getFacetElement(sourceElement, FACET_FAST_FORWARD); + if (null != facetElement) { + object = facetElement; + } + createCell(visualDocument, creationData, tr, object, CSS_RICH_DATASCR_BUTTON, Constants.EMPTY); } if (showBoundaryControls) { - createCell(visualDocument, tr, RIGHT_DOUBLE_SCROLL_SYMBOL, + object = RIGHT_DOUBLE_SCROLL_SYMBOL; + facetElement = ComponentUtil.getFacetElement(sourceElement, FACET_LAST); + if (null != facetElement) { + object = facetElement; + } + createCell(visualDocument, creationData, tr, object, CSS_RICH_DATASCR_BUTTON, Constants.EMPTY); } return creationData; } - /** - * Creates the cell with central alignment. - * - * @param visualDocument the visual document - * @param tr the table row to add the cell - * @param text the text in the cell - * @param styleClass the style class for the cell - * @param style the style for the cell - */ - private void createCell(nsIDOMDocument visualDocument, nsIDOMElement tr, - String text, String styleClass, String style) { + + private void createCell(nsIDOMDocument visualDocument, + VpeCreationData creationData, nsIDOMElement tr, Object element, + String styleClass, String style) { nsIDOMElement td = visualDocument.createElement(HTML.TAG_TD); td.setAttribute(HTML.ATTR_ALIGN, HTML.VALUE_ALIGN_CENTER); - nsIDOMText cellText = visualDocument.createTextNode(text); if (ComponentUtil.isNotBlank(styleClass)) { td.setAttribute(HTML.ATTR_CLASS, styleClass); @@ -203,7 +240,14 @@ td.setAttribute(HTML.ATTR_STYLE, style); } - td.appendChild(cellText); + if (element instanceof String) { + nsIDOMText cellText = visualDocument.createTextNode((String)element); + td.appendChild(cellText); + } else if (element instanceof Element) { + VpeChildrenInfo facetInfo = new VpeChildrenInfo(td); + facetInfo.addSourceChild((Element) element); + creationData.addChildrenInfo(facetInfo); + } tr.appendChild(td); } @@ -229,7 +273,7 @@ .getAttribute(ATTR_FAST_CONTROLS))); maxPages = ComponentUtil.parseNumberAttribute(sourceElement, - ATTR_MAX_PAGES, MINIMAL_CELLS_NUMBER); + ATTR_MAX_PAGES, DEFAULT_CELLS_NUMBER); page = ComponentUtil.parseNumberAttribute(sourceElement, ATTR_PAGE, DEFAULT_PAGE_NUMBER);

17 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r11916 - in trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model: helpers/page and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2008-11-20 11:24:00 -0500 (Thu, 20 Nov 2008) New Revision: 11916 Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/StrutsConfigLoader.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/page/LinkRecognizer.java Log: JBIDE-3085 Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/StrutsConfigLoader.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/StrutsConfigLoader.java 2008-11-20 16:21:11 UTC (rev 11915) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/StrutsConfigLoader.java 2008-11-20 16:24:00 UTC (rev 11916) @@ -11,6 +11,7 @@ package org.jboss.tools.struts.model; import org.jboss.tools.struts.*; +import org.jboss.tools.jst.web.model.AbstractWebDiagramLoader; import org.jboss.tools.jst.web.model.WebProcessLoader; import org.jboss.tools.common.meta.*; import org.jboss.tools.common.model.*; @@ -24,15 +25,20 @@ import org.w3c.dom.*; -public class StrutsConfigLoader implements WebProcessLoader, StrutsConstants { +public class StrutsConfigLoader extends AbstractWebDiagramLoader implements WebProcessLoader, StrutsConstants { public static String LAYOUT_FILE_EXTENSION = "strutsdia"; - private FileAuxiliary aux = new FileAuxiliary(LAYOUT_FILE_EXTENSION, false); private SPUtil sputil = new SPUtil(); - XModelObjectLoaderUtil util = new SCUtil(); - boolean isLight = false; public StrutsConfigLoader() {} - + + protected FileAuxiliary createFileAuxiliary() { + return new FileAuxiliary(LAYOUT_FILE_EXTENSION, false); + } + + protected XModelObjectLoaderUtil createUtil() { + return new SCUtil(); + } + int getVersion(String entity) { if(entity.endsWith(VER_SUFFIX_10)) return 10; if(entity.endsWith(VER_SUFFIX_11)) return 11; @@ -57,7 +63,6 @@ object.setAttributeValue("isIncorrect", "yes"); object.setAttributeValue("incorrectBody", body); object.set("actualBodyTimeStamp", "-1"); -// return; } else { object.setAttributeValue("isIncorrect", "no"); object.set("correctBody", body); @@ -71,7 +76,8 @@ } Element element = doc.getDocumentElement(); util.load(element, object); - setEncoding(object, body); + + setEncoding(object, body); NodeList nl = doc.getChildNodes(); for (int i = 0; i < nl.getLength(); i++) { Node n = nl.item(i); @@ -98,12 +104,6 @@ } } - protected void setEncoding(XModelObject object, String body) { - String encoding = XModelObjectLoaderUtil.getEncoding(body); - if(encoding == null) encoding = ""; - object.setAttributeValue(XModelObjectConstants.ATTR_NAME_ENCODING, encoding); - } - // private DocumentType getDocumentType(Element element) { // NodeList nl = element.getOwnerDocument().getChildNodes(); // for (int i = 0; i < nl.getLength(); i++) { @@ -131,38 +131,7 @@ process.firePrepared(); } - public boolean update(XModelObject object) throws XModelException { - XModelObject p = object.getParent(); - if (p == null) return true; - FolderLoader fl = (FolderLoader)p; - String body = fl.getBodySource(FileAnyImpl.toFileName(object)).get(); -// String encoding = XModelObjectLoaderUtil.getEncoding(body); -// body = FileUtil.encode(body, encoding); - AbstractExtendedXMLFileImpl f = (AbstractExtendedXMLFileImpl)object; - f.setUpdateLock(); - try { - f.edit(body, true); - } finally { - f.releaseUpdateLock(); - } - object.setModified(false); - XModelObjectLoaderUtil.updateModifiedOnSave(object); - return true; - } - - public boolean save(XModelObject object) { - if (!object.isModified()) return true; - FileAnyImpl file = (FileAnyImpl)object; - String text = file.getAsText(); - XModelObjectLoaderUtil.setTempBody(object, text); - if("yes".equals(object.get("isIncorrect"))) { - return true; - } - return saveLayout(object); - } - public boolean saveLayout(XModelObject object) { - if(isLight) return true; try { XModelObject process = object.getChildByPath(ELM_PROCESS); if(process == null) return true; @@ -210,18 +179,6 @@ } } - public String mainObjectToString(XModelObject object) { - return "" + serializeMainObject(object); - } - - public String serializeObject(XModelObject object) { - return serializeMainObject(object); - } - - public void loadFragment(XModelObject object, Element element) { - util.load(element, object); - } - } class SPUtil extends XModelObjectLoaderUtil implements StrutsConstants { Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/page/LinkRecognizer.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/page/LinkRecognizer.java 2008-11-20 16:21:11 UTC (rev 11915) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/page/LinkRecognizer.java 2008-11-20 16:24:00 UTC (rev 11916) @@ -22,10 +22,15 @@ public class LinkRecognizer { private static LinkRecognizer instance; + private static Object lock = new Object(); public static LinkRecognizer getInstance() { if(instance == null) { - instance = new LinkRecognizer(); + synchronized(lock) { + if(instance == null) { + instance = new LinkRecognizer(); + } + } instance.init(); } return instance; @@ -37,7 +42,9 @@ JSPLinkRecognizerObjectImpl object; Links links; - private LinkRecognizer() {} + private LinkRecognizer() { + links = new Links(); + } void init() { model = PreferenceModelUtilities.getPreferenceModel(); @@ -48,7 +55,6 @@ object.setActive(true); ((XModelImpl)model).setExtraRoot(object); timeStamp = object.getTimeStamp(); - links = new Links(); links.update(object); }

17 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r11915 - trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2008-11-20 11:21:11 -0500 (Thu, 20 Nov 2008) New Revision: 11915 Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesFileLoader.java Log: JBIDE-3085 Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesFileLoader.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesFileLoader.java 2008-11-20 16:20:42 UTC (rev 11914) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesFileLoader.java 2008-11-20 16:21:11 UTC (rev 11915) @@ -16,17 +16,15 @@ import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; -import org.jboss.tools.common.model.XModelObjectConstants; import org.jboss.tools.common.model.filesystems.FileAuxiliary; -import org.jboss.tools.common.model.filesystems.impl.AbstractExtendedXMLFileImpl; import org.jboss.tools.common.model.filesystems.impl.AbstractXMLFileImpl; -import org.jboss.tools.common.model.filesystems.impl.FileAnyImpl; -import org.jboss.tools.common.model.filesystems.impl.FolderLoader; +import org.jboss.tools.common.model.loaders.AuxiliaryLoader; import org.jboss.tools.common.model.loaders.impl.SimpleWebFileLoader; import org.jboss.tools.common.model.plugin.ModelPlugin; import org.jboss.tools.common.model.util.EntityXMLRegistration; import org.jboss.tools.common.model.util.XMLUtil; import org.jboss.tools.common.model.util.XModelObjectLoaderUtil; +import org.jboss.tools.jst.web.model.AbstractWebDiagramLoader; import org.jboss.tools.jst.web.model.WebProcessLoader; import org.jboss.tools.seam.pages.xml.model.impl.SeamPagesDiagramImpl; import org.w3c.dom.Document; @@ -35,13 +33,15 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; -public class SeamPagesFileLoader implements WebProcessLoader, SeamPagesConstants { +public class SeamPagesFileLoader extends AbstractWebDiagramLoader implements WebProcessLoader, SeamPagesConstants, AuxiliaryLoader { public static String AUXILIARY_FILE_EXTENSION = "spdia"; - private FileAuxiliary aux = new FileAuxiliary(AUXILIARY_FILE_EXTENSION, false); - XModelObjectLoaderUtil util = createUtil(); public SeamPagesFileLoader() {} + protected FileAuxiliary createFileAuxiliary() { + return new FileAuxiliary(AUXILIARY_FILE_EXTENSION, false); + } + public void load(XModelObject object) { // String entity = object.getModelEntity().getName(); @@ -69,7 +69,6 @@ } Element element = doc.getDocumentElement(); util.load(element, object); - String loadingError = util.getError(); // ((FileSeamPagesImpl)object).updateRuleIndices(); @@ -87,9 +86,10 @@ } } } + String loadingError = util.getError(); reloadProcess(object); + object.set("actualBodyTimeStamp", "" + object.getTimeStamp()); - ((AbstractXMLFileImpl)object).setLoaderError(loadingError); if(!hasErrors && loadingError != null) { object.setAttributeValue("isIncorrect", "yes"); @@ -98,12 +98,6 @@ } } - protected void setEncoding(XModelObject object, String body) { - String encoding = XModelObjectLoaderUtil.getEncoding(body); - if(encoding == null) encoding = ""; - object.setAttributeValue(XModelObjectConstants.ATTR_NAME_ENCODING, encoding); - } - public void reloadProcess(XModelObject object) { SeamPagesDiagramImpl diagram = (SeamPagesDiagramImpl)object.getChildByPath(ELM_DIAGRAM); if(diagram == null) return; @@ -122,34 +116,6 @@ diagram.firePrepared(); } - public boolean update(XModelObject object) throws XModelException { - XModelObject p = object.getParent(); - if (p == null) return true; - FolderLoader fl = (FolderLoader)p; - String body = fl.getBodySource(FileAnyImpl.toFileName(object)).get(); - AbstractExtendedXMLFileImpl f = (AbstractExtendedXMLFileImpl)object; - f.setUpdateLock(); - try { - f.edit(body, true); - } finally { - f.releaseUpdateLock(); - } - object.setModified(false); - XModelObjectLoaderUtil.updateModifiedOnSave(object); - return true; - } - - public boolean save(XModelObject object) { - if (!object.isModified()) return true; - FileAnyImpl file = (FileAnyImpl)object; - String text = file.getAsText(); - XModelObjectLoaderUtil.setTempBody(object, text); - if("yes".equals(object.get("isIncorrect"))) { - return true; - } - return saveLayout(object); - } - public boolean saveLayout(XModelObject object) { if(object == null || !object.isActive()) return false; XModelObjectLoaderUtil util = new XModelObjectLoaderUtil(); @@ -203,20 +169,8 @@ } } - public String mainObjectToString(XModelObject object) { - return "" + serializeMainObject(object); - } - - public String serializeObject(XModelObject object) { - return serializeMainObject(object); - } - - public void loadFragment(XModelObject object, Element element) { - util.load(element, object); - } - protected XModelObjectLoaderUtil createUtil() { return new SeamPagesLoaderUtil(); } - + }

17 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r11914 - trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2008-11-20 11:20:42 -0500 (Thu, 20 Nov 2008) New Revision: 11914 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/FileTilesLoader.java Log: JBIDE-3085 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/FileTilesLoader.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/FileTilesLoader.java 2008-11-20 16:20:12 UTC (rev 11913) +++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/FileTilesLoader.java 2008-11-20 16:20:42 UTC (rev 11914) @@ -14,19 +14,15 @@ import java.io.StringWriter; import org.jboss.tools.common.meta.XModelEntity; -import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; -import org.jboss.tools.common.model.XModelObjectConstants; import org.jboss.tools.common.model.filesystems.FileAuxiliary; -import org.jboss.tools.common.model.filesystems.impl.AbstractExtendedXMLFileImpl; import org.jboss.tools.common.model.filesystems.impl.AbstractXMLFileImpl; -import org.jboss.tools.common.model.filesystems.impl.FileAnyImpl; -import org.jboss.tools.common.model.filesystems.impl.FolderLoader; import org.jboss.tools.common.model.loaders.impl.SimpleWebFileLoader; import org.jboss.tools.common.model.plugin.ModelPlugin; import org.jboss.tools.common.model.util.EntityXMLRegistration; import org.jboss.tools.common.model.util.XMLUtil; import org.jboss.tools.common.model.util.XModelObjectLoaderUtil; +import org.jboss.tools.jst.web.model.AbstractWebDiagramLoader; import org.jboss.tools.jst.web.model.WebProcessLoader; import org.w3c.dom.Document; import org.w3c.dom.DocumentType; @@ -34,10 +30,16 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; -public class FileTilesLoader implements WebProcessLoader, TilesConstants { - private FileAuxiliary aux = new FileAuxiliary("l4t", false); - XModelObjectLoaderUtil util = createUtil(); +public class FileTilesLoader extends AbstractWebDiagramLoader implements WebProcessLoader, TilesConstants { + protected FileAuxiliary createFileAuxiliary() { + return new FileAuxiliary("l4t", false); + } + + protected XModelObjectLoaderUtil createUtil() { + return new FTLoaderUtil(); + } + public void load(XModelObject object) { String body = XModelObjectLoaderUtil.getTempBody(object); int resolution = EntityXMLRegistration.getInstance().resolve(object.getModelEntity()); @@ -49,8 +51,6 @@ object.setAttributeValue("isIncorrect", "yes"); object.setAttributeValue("incorrectBody", body); object.set("actualBodyTimeStamp", "-1"); -// XModelObjectLoaderUtil.addRequiredChildren(object); -// return; } else { object.setAttributeValue("isIncorrect", "no"); object.set("correctBody", body); @@ -64,7 +64,6 @@ } Element element = doc.getDocumentElement(); util.load(element, object); - String loadingError = util.getError(); setEncoding(object, body); NodeList nl = doc.getChildNodes(); @@ -75,9 +74,10 @@ object.setAttributeValue("systemId", dt.getSystemId()); } } + String loadingError = util.getError(); reloadProcess(object); - object.set("actualBodyTimeStamp", "" + object.getTimeStamp()); + object.set("actualBodyTimeStamp", "" + object.getTimeStamp()); ((AbstractXMLFileImpl)object).setLoaderError(loadingError); if(!hasErrors && loadingError != null) { object.setAttributeValue("isIncorrect", "yes"); @@ -86,12 +86,6 @@ } } - protected void setEncoding(XModelObject object, String body) { - String encoding = XModelObjectLoaderUtil.getEncoding(body); - if(encoding == null) encoding = ""; - object.setAttributeValue(XModelObjectConstants.ATTR_NAME_ENCODING, encoding); - } - public void reloadProcess(XModelObject object) { TilesProcessImpl process = (TilesProcessImpl)object.getChildByPath(ELM_PROCESS); if(process == null) return; @@ -109,33 +103,6 @@ process.firePrepared(); } - public boolean update(XModelObject object) throws XModelException { - XModelObject p = object.getParent(); - if (p == null) return true; - FolderLoader fl = (FolderLoader)p; - String body = fl.getBodySource(FileAnyImpl.toFileName(object)).get(); - AbstractExtendedXMLFileImpl f = (AbstractExtendedXMLFileImpl)object; - f.setUpdateLock(); - try { - f.edit(body, true); - } finally { - f.releaseUpdateLock(); - } - object.setModified(false); - XModelObjectLoaderUtil.updateModifiedOnSave(object); - return true; - } - - public boolean save(XModelObject object) { - if (!object.isModified()) return true; - FileAnyImpl file = (FileAnyImpl)object; - XModelObjectLoaderUtil.setTempBody(object, file.getAsText()); - if("yes".equals(object.get("isIncorrect"))) { - return true; - } - return saveLayout(object); - } - static boolean DO_NOT_SAVE = true; public boolean saveLayout(XModelObject object) { @@ -178,22 +145,6 @@ } } - public String mainObjectToString(XModelObject object) { - return "" + serializeMainObject(object); - } - - public String serializeObject(XModelObject object) { - return serializeMainObject(object); - } - - protected XModelObjectLoaderUtil createUtil() { - return new FTLoaderUtil(); - } - - public void loadFragment(XModelObject object, Element element) { - util.load(element, object); - } - } class FTLoaderUtil extends XModelObjectLoaderUtil {

17 years, 5 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits November 2008