JBoss Tools SVN: r21146 - in branches/hibernatetools-multiversion/hibernatetools/plugins: org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2010-03-31 08:04:50 -0400 (Wed, 31 Mar 2010)
New Revision: 21146
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/TableFilterImpl.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationLaunchDelegate.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/ReverseEngineeringEditor.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/OverrideRepositoryStub.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/TableFilterStub.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-6070 - update
Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/TableFilterImpl.java
===================================================================
--- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/TableFilterImpl.java 2010-03-31 07:39:46 UTC (rev 21145)
+++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/TableFilterImpl.java 2010-03-31 12:04:50 UTC (rev 21146)
@@ -26,7 +26,7 @@
public class TableFilterImpl implements ITableFilter {
- TableFilterStub tf = new TableFilterStub();
+ TableFilterStub tf = TableFilterStub.newInstance();
private final ReverseEngineeringDefinitionImpl revModel;
protected TableFilterImpl(
Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationLaunchDelegate.java
===================================================================
--- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationLaunchDelegate.java 2010-03-31 07:39:46 UTC (rev 21145)
+++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationLaunchDelegate.java 2010-03-31 12:04:50 UTC (rev 21146)
@@ -290,7 +290,7 @@
if(revengres!=null) {
File file = PathHelper.getLocation( revengres ).toFile();
- repository = new OverrideRepositoryStub();
+ repository = OverrideRepositoryStub.newInstance();
repository.addFile(file);
}
Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/ReverseEngineeringEditor.java
===================================================================
--- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/ReverseEngineeringEditor.java 2010-03-31 07:39:46 UTC (rev 21145)
+++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/ReverseEngineeringEditor.java 2010-03-31 12:04:50 UTC (rev 21146)
@@ -198,11 +198,11 @@
ITableFilter[] tableFilters = getReverseEngineeringDefinition().getTableFilters();
SettingsStub settings = configuration.getSettings2();
- OverrideRepositoryStub repository = new OverrideRepositoryStub();///*settings.getDefaultCatalogName(),settings.getDefaultSchemaName()*/);
+ OverrideRepositoryStub repository = OverrideRepositoryStub.newInstance();///*settings.getDefaultCatalogName(),settings.getDefaultSchemaName()*/);
boolean hasIncludes = false;
for (int i = 0; i < tableFilters.length; i++) {
ITableFilter filter = tableFilters[i];
- TableFilterStub tf = new TableFilterStub();
+ TableFilterStub tf = TableFilterStub.newInstance();
tf.setExclude(filter.getExclude());
if(filter.getExclude()!=null && !filter.getExclude().booleanValue()) {
hasIncludes = true;
@@ -212,7 +212,7 @@
tf.setMatchSchema(filter.getMatchSchema());
repository.addTableFilter(tf);
}
- TableFilterStub tf = new TableFilterStub();
+ TableFilterStub tf = TableFilterStub.newInstance();
tf.setExclude(Boolean.FALSE);
tf.setMatchCatalog(".*"); //$NON-NLS-1$
tf.setMatchSchema(".*"); //$NON-NLS-1$
Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/OverrideRepositoryStub.java
===================================================================
--- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/OverrideRepositoryStub.java 2010-03-31 07:39:46 UTC (rev 21145)
+++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/OverrideRepositoryStub.java 2010-03-31 12:04:50 UTC (rev 21146)
@@ -10,6 +10,10 @@
protected OverrideRepositoryStub(Object overrideRepository) {
this.overrideRepository = (OverrideRepository)overrideRepository;
}
+
+ public static OverrideRepositoryStub newInstance() {
+ return new OverrideRepositoryStub(new OverrideRepository());
+ }
public void addFile(File file) {
overrideRepository.addFile(file);
Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/TableFilterStub.java
===================================================================
--- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/TableFilterStub.java 2010-03-31 07:39:46 UTC (rev 21145)
+++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/TableFilterStub.java 2010-03-31 12:04:50 UTC (rev 21146)
@@ -9,6 +9,10 @@
protected TableFilterStub(Object tableFilter) {
this.tableFilter = (TableFilter)tableFilter;
}
+
+ public static TableFilterStub newInstance() {
+ return new TableFilterStub(new TableFilter());
+ }
public void setExclude(Boolean exclude) {
tableFilter.setExclude(exclude);
14 years
JBoss Tools SVN: r21145 - in trunk/ws/plugins: org.jboss.tools.ws.ui/META-INF and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2010-03-31 03:39:46 -0400 (Wed, 31 Mar 2010)
New Revision: 21145
Modified:
trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/WSDL2JavaCodeGenConfigWidget.java
trunk/ws/plugins/org.jboss.tools.ws.ui/META-INF/MANIFEST.MF
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUIMessages.java
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/JBossWSUIUtils.java
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateSampleClassWizardPage.java
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateWizard.java
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateWizardValidator.java
Log:
JBIDE-5934: validate the packagename of web service client and web service sample wizard
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/WSDL2JavaCodeGenConfigWidget.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/WSDL2JavaCodeGenConfigWidget.java 2010-03-30 18:22:32 UTC (rev 21144)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/WSDL2JavaCodeGenConfigWidget.java 2010-03-31 07:39:46 UTC (rev 21145)
@@ -1,5 +1,7 @@
package org.jboss.tools.ws.creation.ui.widgets;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
@@ -22,11 +24,13 @@
import org.jboss.tools.ws.creation.core.data.ServiceModel;
import org.jboss.tools.ws.creation.core.messages.JBossWSCreationCoreMessages;
import org.jboss.tools.ws.creation.core.utils.JBossWSCreationUtils;
+import org.jboss.tools.ws.ui.utils.JBossWSUIUtils;
@SuppressWarnings("restriction")
public class WSDL2JavaCodeGenConfigWidget extends SimpleWidgetDataContributor {
private ServiceModel model;
+ private IStatus status = null;
public ServiceModel getModel() {
return model;
@@ -46,7 +50,7 @@
}
public WidgetDataEvents addControls(Composite parent,
- Listener statusListener) {
+ final Listener statusListener) {
Composite configCom = new Composite(parent, SWT.NONE);
GridLayout layout = new GridLayout(3, false);
@@ -56,7 +60,7 @@
// custom package name
Label lblCustomPakage = new Label(configCom, SWT.NONE);
lblCustomPakage
- .setText(JBossWSCreationCoreMessages.Label_Custom_Package_Name);
+ .setText(JBossWSCreationCoreMessages.Label_Custom_Package_Name);
final Text txtCustomPkgName = new Text(configCom, SWT.BORDER);
txtCustomPkgName.setText(model.getCustomPackage());
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -65,16 +69,19 @@
txtCustomPkgName.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
- model.setCustomPackage(txtCustomPkgName.getText());
+ if (validatePackage(txtCustomPkgName.getText())) {
+ model.setCustomPackage(txtCustomPkgName.getText());
+ }
+ statusListener.handleEvent(null);
}
});
// target
new Label(configCom, SWT.NONE)
- .setText(JBossWSCreationCoreMessages.Label_JaxWS_Target);
+ .setText(JBossWSCreationCoreMessages.Label_JaxWS_Target);
final Combo cbSpec = new Combo(configCom, SWT.BORDER | SWT.READ_ONLY);
- cbSpec.add(JBossWSCreationCoreMessages.Value_Target_0, 0);
- cbSpec.add(JBossWSCreationCoreMessages.Value_Target_1, 1);
+ cbSpec.add(JBossWSCreationCoreMessages.Value_Target_0, 0);
+ cbSpec.add(JBossWSCreationCoreMessages.Value_Target_1, 1);
if (JBossWSCreationCoreMessages.Value_Target_0
.equals(model.getTarget())) {
cbSpec.select(0);
@@ -93,12 +100,12 @@
// catalog file
new Label(configCom, SWT.NONE)
- .setText(JBossWSCreationCoreMessages.Label_Catalog_File);
+ .setText(JBossWSCreationCoreMessages.Label_Catalog_File);
final Text txtCatlog = new Text(configCom, SWT.BORDER);
txtCatlog.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
Button btnCatlog = new Button(configCom, SWT.NONE);
btnCatlog
- .setText(JBossWSCreationCoreMessages.Label_Button_Text_Seletion);
+ .setText(JBossWSCreationCoreMessages.Label_Button_Text_Seletion);
btnCatlog.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
String fileLocation = new FileDialog(Display.getCurrent()
@@ -110,7 +117,7 @@
// binding files
new Label(configCom, SWT.NONE)
- .setText(JBossWSCreationCoreMessages.Label_Binding_File);
+ .setText(JBossWSCreationCoreMessages.Label_Binding_File);
final List bindingList = new List(configCom, SWT.BORDER
| SWT.SCROLL_LINE | SWT.V_SCROLL | SWT.H_SCROLL);
@@ -131,7 +138,7 @@
Button btnSelect = new Button(configCom, SWT.NONE);
btnSelect
- .setText(JBossWSCreationCoreMessages.Label_Button_Text_Seletion);
+ .setText(JBossWSCreationCoreMessages.Label_Button_Text_Seletion);
btnSelect.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
@@ -159,19 +166,19 @@
}
}
});
-
+
btnExtension = new Button(configCom, SWT.CHECK);
gd = new GridData();
gd.horizontalSpan = 3;
btnExtension.setLayoutData(gd);
- btnExtension.setText(JBossWSCreationCoreMessages.Label_EnableSOAP12_Binding_Extension);
+ btnExtension
+ .setText(JBossWSCreationCoreMessages.Label_EnableSOAP12_Binding_Extension);
btnExtension.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
- model.setEnableSOAP12(btnExtension
- .getSelection());
+ model.setEnableSOAP12(btnExtension.getSelection());
}
});
-
+
if (model.getWsScenario() != WebServiceScenario.CLIENT) {
btnGenDefaultImpl = new Button(configCom, SWT.CHECK);
gd = new GridData();
@@ -207,15 +214,17 @@
}
});
}
-
- //enable enable soap12 checkbox if the target jbossws runtime is less than 3.0
+
+ // enable enable soap12 checkbox if the target jbossws runtime is less
+ // than 3.0
updateExtensionButtonStatus();
-
+
return this;
}
-
- private void updateExtensionButtonStatus(){
- btnExtension.setEnabled(JBossWSCreationUtils.supportSOAP12(model.getWebProjectName()));
+
+ private void updateExtensionButtonStatus() {
+ btnExtension.setEnabled(JBossWSCreationUtils.supportSOAP12(model
+ .getWebProjectName()));
}
private void loadBindingFiles(List bindingList) {
@@ -223,4 +232,22 @@
bindingList.add(fileLocation);
}
}
+
+ private boolean validatePackage(String name) {
+ try {
+ status = JBossWSUIUtils.validatePackageName(name,
+ JBossWSCreationUtils.getJavaProjectByName(model
+ .getWebProjectName()));
+ } catch (JavaModelException e1) {
+ e1.printStackTrace();
+ }
+ if (status != null && status.getSeverity() == IStatus.ERROR) {
+ return false;
+ }
+ return true;
+ }
+
+ public IStatus getStatus() {
+ return status;
+ }
}
Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/META-INF/MANIFEST.MF 2010-03-30 18:22:32 UTC (rev 21144)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/META-INF/MANIFEST.MF 2010-03-31 07:39:46 UTC (rev 21145)
@@ -17,11 +17,13 @@
org.jboss.tools.ws.creation.core,
org.eclipse.wst.common.frameworks,
org.eclipse.wst.common.emfworkbench.integration,
- org.jboss.tools.common.ui
+ org.jboss.tools.common.ui,
+ org.eclipse.core.filesystem
Bundle-ActivationPolicy: lazy
Export-Package: org.jboss.tools.ws.ui,
org.jboss.tools.ws.ui.messages,
- org.jboss.tools.ws.ui.preferences
+ org.jboss.tools.ws.ui.preferences,
+ org.jboss.tools.ws.ui.utils
Bundle-Vendor: %PLUGIN_PROVIDER
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Import-Package: org.eclipse.jst.javaee.web,
Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties 2010-03-30 18:22:32 UTC (rev 21144)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties 2010-03-31 07:39:46 UTC (rev 21145)
@@ -45,7 +45,7 @@
JBossWSGenerateWebXmlWizardPage_Project_Group_Tooltip=If no Dynamic Web Project exists, you must create one before creating your sample web service.
JBossWSGenerateWebXmlWizardPage_Web_Service_Group=Web Service
-Error_JBossWSGenerateWizard_NoProjectSelected=No correct project selected. Please select a Dynamic Web Project to continue.
+Error_JBossWS_GenerateWizard_NoProjectSelected=No correct project selected. Please select a Dynamic Web Project to continue.
Error_JBossWS_Label_Runtime_Load=Error occurred while loading JBossWS Command. Select the correct JBoss Server folder.
Error_JBossWS_Basic_Editor_Composite=Parent control should be Composite
Error_JBossWS_Basic_Editor_Support=Editor supports only Grid layout
@@ -53,6 +53,12 @@
Error_JBossWS_Runtime_List_Field_Editor_Path_To_Home_Diretory_Cannot_Be_Empty=Path to JBossWS home directory cannot be empty
Error_JBossWS_Runtime_List_Field_Editor_Runtime_Name_Is_Not_Correct=Runtime name is not correct
Error_JBossWS_Runtime_List_Field_Editor_Name_Cannot_Be_Empty=Name cannot be empty
+Error_JBossWS_GenerateWizard_PackageName_Cannot_Be_Empty=Package name cannot be empty
+Error_JBossWS_GenerateWizard_ClassName_Cannot_Be_Empty=Class name cannot be empty
Error_JBossWS_GenerateWizard_NotDynamicWebProject=The project must be a Dynamic Web Project and contain a web.xml in a right Location
Error_JBossWS_GenerateWizard_ClassName_Same=The class name has been used in the web project.
-Error_JBossWS_GenerateWizard_ServiceName_Empty=The Service Name may not be an empty string.
\ No newline at end of file
+Error_JBossWS_GenerateWizard_ServiceName_Empty=The Service Name may not be an empty string.
+Error_JBossWS_GenerateWizard_IsOutputFolder=Name conflict with output folder
+Error_JBossWS_GenerateWizard_PackageExists=Package already exists
+Error_JBossWS_GenerateWizard_PackageNotShown=Package already exists. Note: Views might filter empty parent packages
+Error_JBossWS_GenerateWizard_PackageExistsDifferentCase=Package already exists with a different case
\ No newline at end of file
Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUIMessages.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUIMessages.java 2010-03-30 18:22:32 UTC (rev 21144)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUIMessages.java 2010-03-31 07:39:46 UTC (rev 21145)
@@ -69,7 +69,7 @@
public static String JBossWSGenerateWebXmlWizardPage_Project_Group_Tooltip;
public static String JBossWSGenerateWebXmlWizardPage_Web_Service_Group;
- public static String Error_JBossWSGenerateWizard_NoProjectSelected;
+ public static String Error_JBossWS_GenerateWizard_NoProjectSelected;
public static String Error_JBossWS_Label_Runtime_Load;
public static String Error_JBossWS_Basic_Editor_Composite;
public static String Error_JBossWS_Basic_Editor_Support;
@@ -79,9 +79,14 @@
public static String Error_JBossWS_Runtime_List_Field_Editor_Inputelement_Must_Be_An_Instance_Of_List;
public static String Error_JBossWS_GenerateWizard_NotDynamicWebProject;
public static String Error_JBossWS_GenerateWizard_ClassName_Same;
+ public static String Error_JBossWS_GenerateWizard_PackageName_Cannot_Be_Empty;
+ public static String Error_JBossWS_GenerateWizard_ClassName_Cannot_Be_Empty;
public static String Error_JBossWS_GenerateWizard_ServiceName_Empty;
+ public static String Error_JBossWS_GenerateWizard_IsOutputFolder;
+ public static String Error_JBossWS_GenerateWizard_PackageExists;
+ public static String Error_JBossWS_GenerateWizard_PackageNotShown;
+ public static String Error_JBossWS_GenerateWizard_PackageExistsDifferentCase;
-
static {
NLS.initializeMessages(BUNDLE_NAME, JBossWSUIMessages.class);
}
Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/JBossWSUIUtils.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/JBossWSUIUtils.java 2010-03-30 18:22:32 UTC (rev 21144)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/JBossWSUIUtils.java 2010-03-31 07:39:46 UTC (rev 21145)
@@ -12,7 +12,24 @@
package org.jboss.tools.ws.ui.utils;
import java.io.File;
+import java.net.URI;
+import org.eclipse.core.filesystem.EFS;
+import org.eclipse.core.filesystem.IFileStore;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IStatus;
+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.JavaConventions;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.core.JavaModelException;
+import org.jboss.tools.ws.core.utils.StatusUtils;
+import org.jboss.tools.ws.ui.JBossWSUIPlugin;
+import org.jboss.tools.ws.ui.messages.JBossWSUIMessages;
+
/**
* @author Grid Qian
*/
@@ -30,4 +47,89 @@
return returnPath;
}
+ public static IStatus validatePackageName(String name, IJavaElement context) {
+ IStatus status = null;
+ if (context == null || !context.exists()) {
+ status = JavaConventions.validatePackageName(name,JavaCore.VERSION_1_3, JavaCore.VERSION_1_3);
+ if (status != null && !status.isOK()) {
+ return status;
+ }
+ }
+ String[] sourceComplianceLevels = getSourceComplianceLevels(context);
+ status = JavaConventions.validatePackageName(name,sourceComplianceLevels[0], sourceComplianceLevels[1]);
+ if (status != null && status.getSeverity() == IStatus.ERROR) {
+ return status;
+ }
+
+ IPackageFragmentRoot[] roots = null;
+ try {
+ roots = context.getJavaProject().getPackageFragmentRoots();
+ } catch (JavaModelException e) {
+ JBossWSUIPlugin.log(e);
+ }
+ for (IPackageFragmentRoot root : roots) {
+ if (root != null) {
+ IPackageFragment pack = root.getPackageFragment(name);
+ try {
+ IPath rootPath = root.getPath();
+ IPath outputPath = root.getJavaProject()
+ .getOutputLocation();
+ if (rootPath.isPrefixOf(outputPath)
+ && !rootPath.equals(outputPath)) {
+ // if the bin folder is inside of our root, don't allow
+ // to name a package
+ // like the bin folder
+ IPath packagePath = pack.getPath();
+ if (outputPath.isPrefixOf(packagePath)) {
+ status = StatusUtils
+ .warningStatus(JBossWSUIMessages.Error_JBossWS_GenerateWizard_IsOutputFolder);
+ return status;
+ }
+ }
+ if (pack.exists()) {
+ if (pack.containsJavaResources()
+ || !pack.hasSubpackages()) {
+ status = StatusUtils
+ .warningStatus(JBossWSUIMessages.Error_JBossWS_GenerateWizard_PackageExists);
+ } else {
+ status = StatusUtils
+ .warningStatus(JBossWSUIMessages.Error_JBossWS_GenerateWizard_PackageNotShown);
+ }
+ return status;
+ } else {
+ if(pack.getResource() == null){
+ continue;
+ }
+ URI location = pack.getResource().getLocationURI();
+ if (location != null) {
+ IFileStore store = EFS.getStore(location);
+ if (store.fetchInfo().exists()) {
+ status = StatusUtils
+ .warningStatus(JBossWSUIMessages.Error_JBossWS_GenerateWizard_PackageExistsDifferentCase);
+ return status;
+ }
+ }
+ }
+ } catch (CoreException e) {
+ JBossWSUIPlugin.log(e);
+ }
+ }
+ }
+ return status;
+ }
+
+ public static String[] getSourceComplianceLevels(IJavaElement context) {
+ if (context != null) {
+ IJavaProject javaProject = context.getJavaProject();
+ if (javaProject != null) {
+ return new String[] {
+ javaProject.getOption(JavaCore.COMPILER_SOURCE, true),
+ javaProject.getOption(JavaCore.COMPILER_COMPLIANCE,
+ true) };
+ }
+ }
+ return new String[] { JavaCore.getOption(JavaCore.COMPILER_SOURCE),
+ JavaCore.getOption(JavaCore.COMPILER_COMPLIANCE) };
+ }
+
}
\ No newline at end of file
Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateSampleClassWizardPage.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateSampleClassWizardPage.java 2010-03-30 18:22:32 UTC (rev 21144)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateSampleClassWizardPage.java 2010-03-31 07:39:46 UTC (rev 21145)
@@ -55,7 +55,7 @@
packageName.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
- wizard.setClassName(packageName.getText());
+ wizard.setPackageName(packageName.getText());
setPageComplete(isPageComplete());
}
@@ -149,7 +149,7 @@
IStatus status = JBossWSGenerateWizardValidator.isWSClassValid(
testName, wizard.getProject());
int i = 1;
- while (status != null) {
+ while (status != null && status.getSeverity() == IStatus.ERROR) {
testName = currentName + i;
wizard.setClassName(testName);
model = wizard.getServiceModel();
@@ -167,12 +167,16 @@
IStatus status = JBossWSGenerateWizardValidator.isWSClassValid(model
.getCustomClassName(), wizard.getProject());
if (status != null) {
- setMessage(status.getMessage(), DialogPage.ERROR);
- return false;
- } else {
- setMessage(null);
- return true;
+ if (status.getSeverity() == IStatus.ERROR) {
+ setMessage(status.getMessage(), DialogPage.ERROR);
+ return false;
+ } else if (status.getSeverity() == IStatus.WARNING) {
+ setMessage(status.getMessage(), DialogPage.WARNING);
+ return true;
+ }
}
+ setMessage(null);
+ return true;
}
protected void refresh() {
Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateWizard.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateWizard.java 2010-03-30 18:22:32 UTC (rev 21144)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateWizard.java 2010-03-31 07:39:46 UTC (rev 21145)
@@ -150,7 +150,7 @@
if (firstPage != null && !firstPage.getControl().isDisposed()) {
if (firstPage.hasChanged())
firstPage
- .setErrorMessage(JBossWSUIMessages.Error_JBossWSGenerateWizard_NoProjectSelected);
+ .setErrorMessage(JBossWSUIMessages.Error_JBossWS_GenerateWizard_NoProjectSelected);
}
return false;
}
Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateWizardValidator.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateWizardValidator.java 2010-03-30 18:22:32 UTC (rev 21144)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateWizardValidator.java 2010-03-31 07:39:46 UTC (rev 21145)
@@ -15,6 +15,7 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jst.j2ee.model.IModelProvider;
import org.eclipse.jst.j2ee.model.ModelProviderManager;
import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
@@ -28,6 +29,7 @@
import org.jboss.tools.ws.creation.core.messages.JBossWSCreationCoreMessages;
import org.jboss.tools.ws.creation.core.utils.JBossWSCreationUtils;
import org.jboss.tools.ws.ui.messages.JBossWSUIMessages;
+import org.jboss.tools.ws.ui.utils.JBossWSUIUtils;
public class JBossWSGenerateWizardValidator {
@@ -50,7 +52,7 @@
IModelProvider provider = null;
if (model.getWebProjectName() == null) {
return StatusUtils
- .errorStatus(JBossWSUIMessages.Error_JBossWSGenerateWizard_NoProjectSelected);
+ .errorStatus(JBossWSUIMessages.Error_JBossWS_GenerateWizard_NoProjectSelected);
} else {
try {
IProject project = JBossWSCreationUtils.getProjectByName(model
@@ -62,7 +64,7 @@
} catch (Exception exc) {
model.setWebProjectName(null);
return StatusUtils
- .errorStatus(JBossWSUIMessages.Error_JBossWSGenerateWizard_NoProjectSelected);
+ .errorStatus(JBossWSUIMessages.Error_JBossWS_GenerateWizard_NoProjectSelected);
}
}
Object object = provider.getModelObject();
@@ -111,15 +113,20 @@
if (model.getCustomPackage().trim().length() == 0) {
// empty package name
return StatusUtils
- .errorStatus(JBossWSUIMessages.Error_JBossWS_GenerateWizard_ClassName_Same);
+ .errorStatus(JBossWSUIMessages.Error_JBossWS_GenerateWizard_PackageName_Cannot_Be_Empty);
} else if (model.getCustomClassName().trim().length() == 0) {
// empty class name
return StatusUtils
- .errorStatus(JBossWSUIMessages.Error_JBossWS_GenerateWizard_ClassName_Same);
- } else if (project == null) {
- return StatusUtils
- .errorStatus(JBossWSUIMessages.Error_JBossWSGenerateWizard_NoProjectSelected);
+ .errorStatus(JBossWSUIMessages.Error_JBossWS_GenerateWizard_ClassName_Cannot_Be_Empty);
+ } else if (project == null
+ || !JavaEEProjectUtilities.isDynamicWebProject(project)) {
+ return null;
} else {
+ IStatus status = JBossWSUIUtils.validatePackageName(model
+ .getCustomPackage(), JavaCore.create(project));
+ if (status != null && status.getSeverity() == IStatus.ERROR) {
+ return status;
+ }
File file = JBossWSCreationUtils.findFileByPath(className + JAVA,
project.getLocation().toOSString());
if (file != null) {
@@ -127,8 +134,8 @@
return StatusUtils
.errorStatus(JBossWSUIMessages.Error_JBossWS_GenerateWizard_ClassName_Same);
}
+ return status;
}
- return null;
}
private static ServletDescriptor getServletDescriptor(String clsName) {
14 years, 1 month
JBoss Tools SVN: r21144 - trunk/common/plugins/org.jboss.tools.common.model.ui/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-03-30 14:22:32 -0400 (Tue, 30 Mar 2010)
New Revision: 21144
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/META-INF/MANIFEST.MF
Log:
common.model.ui plug-in manifest error fixed
Bundle-ClassPath: .
added to manifest
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/META-INF/MANIFEST.MF 2010-03-30 17:57:51 UTC (rev 21143)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/META-INF/MANIFEST.MF 2010-03-30 18:22:32 UTC (rev 21144)
@@ -2,6 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-ActivationPolicy: lazy
Bundle-Name: %pluginName
+Bundle-ClassPath: .
Bundle-Activator: org.jboss.tools.common.model.ui.ModelUIPlugin
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.jboss.tools.common.model.ui;singleton:=true
14 years, 1 month
JBoss Tools SVN: r21143 - branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2010-03-30 13:57:51 -0400 (Tue, 30 Mar 2010)
New Revision: 21143
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/ArtifactCollectorStub.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/ConfigurationStub.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/ExporterStub.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/GenericExporterStub.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/HibernateConfigurationExporterStub.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/HibernateMappingExporterStub.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/HibernateMappingGlobalSettingsStub.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/OverrideRepositoryStub.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/POJOClassStub.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/ReverseEngineeringStrategyStub.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/TableFilterStub.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-6070 - update
Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/ArtifactCollectorStub.java
===================================================================
--- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/ArtifactCollectorStub.java 2010-03-30 17:25:57 UTC (rev 21142)
+++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/ArtifactCollectorStub.java 2010-03-30 17:57:51 UTC (rev 21143)
@@ -17,12 +17,11 @@
}
public File[] getFiles(String string) {
- return null;
+ return artifactCollector.getFiles(string);
}
public void formatFiles() {
- // TODO Auto-generated method stub
-
+ artifactCollector.formatFiles();
}
}
Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/ConfigurationStub.java
===================================================================
--- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/ConfigurationStub.java 2010-03-30 17:25:57 UTC (rev 21142)
+++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/ConfigurationStub.java 2010-03-30 17:57:51 UTC (rev 21143)
@@ -132,7 +132,7 @@
}
public void updateExporter(ExporterStub exporter) {
- exporter.setConfiguration(configuration);
+ exporter.setConfiguration(this);
}
public Properties getProperties() {
Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/ExporterStub.java
===================================================================
--- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/ExporterStub.java 2010-03-30 17:25:57 UTC (rev 21142)
+++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/ExporterStub.java 2010-03-30 17:57:51 UTC (rev 21143)
@@ -3,7 +3,6 @@
import java.io.File;
import java.util.Properties;
-import org.hibernate.cfg.Configuration;
import org.hibernate.tool.hbm2x.Exporter;
public class ExporterStub {
@@ -15,33 +14,27 @@
}
public void start() {
- // TODO Auto-generated method stub
-
+ exporter.start();
}
- public void setConfiguration(Configuration configuration) {
- // TODO Auto-generated method stub
-
+ public void setConfiguration(ConfigurationStub configuration) {
+ exporter.setConfiguration(configuration.configuration);
}
public void setProperties(Properties props) {
- // TODO Auto-generated method stub
-
+ exporter.setProperties(props);
}
public void setArtifactCollector(ArtifactCollectorStub collector) {
- // TODO Auto-generated method stub
-
+ exporter.setArtifactCollector(collector.artifactCollector);
}
public void setOutputDirectory(File file) {
- // TODO Auto-generated method stub
-
+ exporter.setOutputDirectory(file);
}
public void setTemplatePath(String[] array) {
- // TODO Auto-generated method stub
-
+ exporter.setTemplatePath(array);
}
}
Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/GenericExporterStub.java
===================================================================
--- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/GenericExporterStub.java 2010-03-30 17:25:57 UTC (rev 21142)
+++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/GenericExporterStub.java 2010-03-30 17:57:51 UTC (rev 21143)
@@ -11,18 +11,15 @@
}
public void setFilePattern(String property) {
- // TODO Auto-generated method stub
-
+ genericExporter.setFilePattern(property);
}
public void setTemplateName(String property) {
- // TODO Auto-generated method stub
-
+ genericExporter.setTemplateName(property);
}
public void setForEach(String property) {
- // TODO Auto-generated method stub
-
+ genericExporter.setForEach(property);
}
}
Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/HibernateConfigurationExporterStub.java
===================================================================
--- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/HibernateConfigurationExporterStub.java 2010-03-30 17:25:57 UTC (rev 21142)
+++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/HibernateConfigurationExporterStub.java 2010-03-30 17:57:51 UTC (rev 21143)
@@ -18,12 +18,10 @@
}
public void setCustomProperties(Properties props) {
- // TODO Auto-generated method stub
-
+ hibernateConfigurationExporter.setCustomProperties(props);
}
public void setOutput(StringWriter stringWriter) {
- // TODO Auto-generated method stub
-
+ hibernateConfigurationExporter.setOutput(stringWriter);
}
}
Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/HibernateMappingExporterStub.java
===================================================================
--- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/HibernateMappingExporterStub.java 2010-03-30 17:25:57 UTC (rev 21142)
+++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/HibernateMappingExporterStub.java 2010-03-30 17:57:51 UTC (rev 21143)
@@ -16,13 +16,11 @@
}
public void setGlobalSettings(HibernateMappingGlobalSettingsStub hmgs) {
- // TODO Auto-generated method stub
-
+ hibernateMappingExporter.setGlobalSettings(hmgs.hibernateMappingGlobalSettings);
}
public void start() {
- // TODO Auto-generated method stub
-
+ hibernateMappingExporter.start();
}
protected File getOutputDirectory() {
Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/HibernateMappingGlobalSettingsStub.java
===================================================================
--- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/HibernateMappingGlobalSettingsStub.java 2010-03-30 17:25:57 UTC (rev 21142)
+++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/HibernateMappingGlobalSettingsStub.java 2010-03-30 17:57:51 UTC (rev 21143)
@@ -15,7 +15,6 @@
}
public void setDefaultAccess(String string) {
- // TODO Auto-generated method stub
-
+ hibernateMappingGlobalSettings.setDefaultAccess(string);
}
}
Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/OverrideRepositoryStub.java
===================================================================
--- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/OverrideRepositoryStub.java 2010-03-30 17:25:57 UTC (rev 21142)
+++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/OverrideRepositoryStub.java 2010-03-30 17:57:51 UTC (rev 21143)
@@ -2,20 +2,27 @@
import java.io.File;
+import org.hibernate.cfg.reveng.OverrideRepository;
+
public class OverrideRepositoryStub {
+ protected OverrideRepository overrideRepository;
+ protected OverrideRepositoryStub(Object overrideRepository) {
+ this.overrideRepository = (OverrideRepository)overrideRepository;
+ }
+
public void addFile(File file) {
- // TODO Auto-generated method stub
-
+ overrideRepository.addFile(file);
}
public ReverseEngineeringStrategyStub getReverseEngineeringStrategy(
ReverseEngineeringStrategyStub res) {
- // TODO Auto-generated method stub
- return null;
+ return new ReverseEngineeringStrategyStub(
+ overrideRepository.getReverseEngineeringStrategy(res.reverseEngineeringStrategy));
}
public void addTableFilter(TableFilterStub tf) {
+ overrideRepository.addTableFilter(tf.tableFilter);
}
}
Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/POJOClassStub.java
===================================================================
--- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/POJOClassStub.java 2010-03-30 17:25:57 UTC (rev 21142)
+++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/POJOClassStub.java 2010-03-30 17:57:51 UTC (rev 21143)
@@ -11,8 +11,7 @@
}
public String getQualifiedDeclarationName() {
- // TODO Auto-generated method stub
- return null;
+ return pojoClass.getQualifiedDeclarationName();
}
}
Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/ReverseEngineeringStrategyStub.java
===================================================================
--- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/ReverseEngineeringStrategyStub.java 2010-03-30 17:25:57 UTC (rev 21142)
+++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/ReverseEngineeringStrategyStub.java 2010-03-30 17:57:51 UTC (rev 21143)
@@ -14,8 +14,7 @@
return ReverseEngineeringStrategy.class.getName();
}
- public void setSettings(ReverseEngineeringSettingsStub qqsettings) {
- // TODO Auto-generated method stub
-
+ public void setSettings(ReverseEngineeringSettingsStub settings) {
+ reverseEngineeringStrategy.setSettings(settings.reverseEngineeringSettings);
}
}
Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/TableFilterStub.java
===================================================================
--- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/TableFilterStub.java 2010-03-30 17:25:57 UTC (rev 21142)
+++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/TableFilterStub.java 2010-03-30 17:57:51 UTC (rev 21143)
@@ -1,45 +1,45 @@
package org.hibernate.mediator.stubs;
+import org.hibernate.cfg.reveng.TableFilter;
+
public class TableFilterStub {
+
+ protected TableFilter tableFilter;
+ protected TableFilterStub(Object tableFilter) {
+ this.tableFilter = (TableFilter)tableFilter;
+ }
+
public void setExclude(Boolean exclude) {
- // TODO Auto-generated method stub
-
+ tableFilter.setExclude(exclude);
}
public void setMatchCatalog(String matchCatalog) {
- // TODO Auto-generated method stub
-
+ tableFilter.setMatchCatalog(matchCatalog);
}
public void setMatchName(String matchName) {
- // TODO Auto-generated method stub
-
+ tableFilter.setMatchName(matchName);
}
public void setMatchSchema(String matchSchema) {
- // TODO Auto-generated method stub
-
+ tableFilter.setMatchSchema(matchSchema);
}
public Boolean getExclude() {
- // TODO Auto-generated method stub
- return null;
+ return tableFilter.getExclude();
}
public String getMatchCatalog() {
- // TODO Auto-generated method stub
- return null;
+ return tableFilter.getMatchCatalog();
}
public String getMatchSchema() {
- // TODO Auto-generated method stub
- return null;
+ return tableFilter.getMatchSchema();
}
public String getMatchName() {
- // TODO Auto-generated method stub
- return null;
+ return tableFilter.getMatchName();
}
}
14 years, 1 month
JBoss Tools SVN: r21142 - in branches/hibernatetools-multiversion/hibernatetools/plugins: org.hibernate.mediator and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2010-03-30 13:25:57 -0400 (Tue, 30 Mar 2010)
New Revision: 21142
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/.classpath
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/ConsoleConfigClassLoader.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/ConfigurationStub.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/ConfigurationStubFactory.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-6070 - update
Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java
===================================================================
--- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java 2010-03-30 16:04:15 UTC (rev 21141)
+++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java 2010-03-30 17:25:57 UTC (rev 21142)
@@ -225,9 +225,11 @@
}
protected ClassLoader getParentClassLoader() {
+ return ConfigurationStub.class.getClassLoader();
+ //return this.getClass().getClassLoader();
//return ClassLoader.getSystemClassLoader();
//return Thread.currentThread().getContextClassLoader().getParent().getParent();
- return Thread.currentThread().getContextClassLoader();
+ //return Thread.currentThread().getContextClassLoader();
}
public ConfigurationStub getConfiguration() {
return configStub;
Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/.classpath
===================================================================
--- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/.classpath 2010-03-30 16:04:15 UTC (rev 21141)
+++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/.classpath 2010-03-30 17:25:57 UTC (rev 21142)
@@ -21,7 +21,7 @@
<classpathentry kind="lib" path="lib/hibernate/antlr-2.7.6.jar"/>
<classpathentry kind="lib" path="lib/annotations/hibernate-entitymanager.jar" sourcepath="D:/Temp/_hibernate/hibernate-entitymanager-3.4.0.GA-sources.jar"/>
<classpathentry kind="lib" path="lib/hibernate/javassist.jar"/>
- <classpathentry kind="lib" path="lib/annotations/hibernate-validator.jar"/>
+ <classpathentry kind="lib" path="lib/annotations/hibernate-validator.jar" sourcepath="D:/Temp/_hibernate/hibernate-validator-3.1.0.GA-sources.jar "/>
<classpathentry kind="lib" path="lib/hibernate/log4j-1.2.15.jar" sourcepath="D:/Temp/_hibernate/log4j-1.2.15-sources.jar "/>
<classpathentry kind="lib" path="lib/hibernate/hibernate-jmx.jar" sourcepath="D:/Temp/_hibernate/hibernate-jmx-3.3.2.GA-sources.jar "/>
<classpathentry kind="lib" path="lib/hibernate/commons-collections-3.1.jar"/>
Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/ConsoleConfigClassLoader.java
===================================================================
--- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/ConsoleConfigClassLoader.java 2010-03-30 16:04:15 UTC (rev 21141)
+++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/ConsoleConfigClassLoader.java 2010-03-30 17:25:57 UTC (rev 21142)
@@ -49,8 +49,7 @@
* cleanup jar file factory cache
*/
@SuppressWarnings({ "nls", "unchecked" })
- public boolean cleanupJarFileFactory()
- {
+ public boolean cleanupJarFileFactory() {
boolean res = false;
Class classJarURLConnection = null;
try {
Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/ConfigurationStub.java
===================================================================
--- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/ConfigurationStub.java 2010-03-30 16:04:15 UTC (rev 21141)
+++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/ConfigurationStub.java 2010-03-30 17:25:57 UTC (rev 21142)
@@ -55,7 +55,6 @@
configuration.buildMappings();
}
- // TODO: temporary should be protected and/or SettingsStub?
public SettingsStub buildSettings() {
return new SettingsStub(configuration.buildSettings());
}
@@ -72,7 +71,6 @@
return new IHQLCodeAssistStub(new HQLCodeAssist(configuration));
}
- // TODO: temporary should be protected and/or NamingStrategyStub?
public NamingStrategyStub getNamingStrategy() {
return new NamingStrategyStub(configuration.getNamingStrategy());
}
@@ -91,17 +89,14 @@
return arr.iterator();
}
- // TODO: temporary should be protected and/or PersistentClassStub?
public PersistentClassStub getClassMapping(String entityName) {
return PersistentClassStubFactory.createPersistentClassStub(configuration.getClassMapping(entityName));
}
- // TODO: temporary should be protected and/or MappingsStub?
public MappingsStub createMappings() {
return new MappingsStub(configuration.createMappings());
}
- // TODO: temporary should be protected and/or MappingsStub?
public MappingStub buildMapping() {
return new MappingStub(configuration.buildMapping());
}
Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/ConfigurationStubFactory.java
===================================================================
--- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/ConfigurationStubFactory.java 2010-03-30 16:04:15 UTC (rev 21141)
+++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/ConfigurationStubFactory.java 2010-03-30 17:25:57 UTC (rev 21142)
@@ -109,7 +109,7 @@
private Configuration buildAnnotationConfiguration() throws ClassNotFoundException,
InstantiationException, IllegalAccessException {
Class<?> clazz = ReflectHelper
- .classForName("org.hibernate.cfg.AnnotationConfiguration", Object.class); //$NON-NLS-1$
+ .classForName("org.hibernate.cfg.AnnotationConfiguration", Configuration.class); //$NON-NLS-1$
Configuration annotationConfig = (Configuration)clazz.newInstance();
return annotationConfig;
}
@@ -134,7 +134,7 @@
overrides.put("hibernate.archive.autodetection", "none"); //$NON-NLS-1$//$NON-NLS-2$
}
Class<?> clazz = ReflectHelper.classForName(
- "org.hibernate.ejb.Ejb3Configuration", Object.class); //$NON-NLS-1$
+ "org.hibernate.ejb.Ejb3Configuration", Configuration.class); //$NON-NLS-1$
Object ejb3cfg = clazz.newInstance();
if (StringHelper.isNotEmpty(entityResolver)) {
14 years, 1 month
JBoss Tools SVN: r21141 - in trunk/jsf/docs/userguide/en-US: images/visual_page and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: abogachuk
Date: 2010-03-30 12:04:15 -0400 (Tue, 30 Mar 2010)
New Revision: 21141
Added:
trunk/jsf/docs/userguide/en-US/images/visual_page/visual_page_16a.png
Modified:
trunk/jsf/docs/userguide/en-US/editors.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-931
Modified: trunk/jsf/docs/userguide/en-US/editors.xml
===================================================================
--- trunk/jsf/docs/userguide/en-US/editors.xml 2010-03-30 15:42:59 UTC (rev 21140)
+++ trunk/jsf/docs/userguide/en-US/editors.xml 2010-03-30 16:04:15 UTC (rev 21141)
@@ -1916,6 +1916,24 @@
<!--para>You can even
attach your stylesheet to the preview.</para-->
</section>
+ <section id="vpe_errors">
+ <title>Error Messages</title>
+ <para><property>Visual Page Editor</property> provide a user friendly and effective <property>error</property> messages, which should make solving problems easier. <property>Error</property> message contains a reference to the problem and its description. Also in <property>Error</property> area you can find a link to <property>Visual Page Editor</property> forum and <property>Details</property> button whick is used to see a error trace. </para>
+ <para>If the error occurs while editor loading, error message will contain information about of what might have caused the error ( a missing library or errors in source code).</para>
+ <figure>
+ <title>Visual Page Error Message</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/visual_page/visual_page_16a.png"/>
+ </imageobject>
+
+ </mediaobject>
+ </figure>
+
+ </section>
+
+
+
<section id="custom_facelets_support">
<title>Support for Custom Facelets Components</title>
<para><property>Visual Page Editor</property> (starting from 3.0.0.M3 version of
Added: trunk/jsf/docs/userguide/en-US/images/visual_page/visual_page_16a.png
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/docs/userguide/en-US/images/visual_page/visual_page_16a.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
14 years, 1 month
JBoss Tools SVN: r21140 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2010-03-30 11:42:59 -0400 (Tue, 30 Mar 2010)
New Revision: 21140
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-6107
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2010-03-30 14:13:10 UTC (rev 21139)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2010-03-30 15:42:59 UTC (rev 21140)
@@ -1109,14 +1109,14 @@
.startActiveEditor(ActiveEditorSwitcher.ACTIVE_EDITOR_VISUAL)) {
try {
mouseUpSelectionReasonFlag = (reason & nsISelectionListener.MOUSEUP_REASON) > 0;
- if (mouseUpSelectionReasonFlag
+ if (
// commited by Dzmitrovich - experimental
// TODO check selection and if are appear errors then
// uncommented next code
- // || reason == nsISelectionListener.NO_REASON
- || reason == nsISelectionListener.KEYPRESS_REASON
- || reason == nsISelectionListener.SELECTALL_REASON
- || (reason & nsISelectionListener.MOUSEDOWN_REASON) > 0) {
+ // reason != nsISelectionListener.NO_REASON
+ reason == nsISelectionListener.KEYPRESS_REASON
+ || reason == nsISelectionListener.SELECTALL_REASON)
+ {
if (VpeDebug.PRINT_VISUAL_SELECTION_EVENT) {
System.out
.println("<<< notifySelectionChanged: " + reason); //$NON-NLS-1$
14 years, 1 month
JBoss Tools SVN: r21139 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2010-03-30 10:13:10 -0400 (Tue, 30 Mar 2010)
New Revision: 21139
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/VpeDnD.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5042
Enhance DnD support in VPE:
- removed a System.out.println line, which was committed by a mistake
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/VpeDnD.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/VpeDnD.java 2010-03-30 14:12:05 UTC (rev 21138)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/VpeDnD.java 2010-03-30 14:13:10 UTC (rev 21139)
@@ -749,7 +749,6 @@
int dropOffset = 0;
int mouseX = nsuiEvent.getPageX();
int mouseY = nsuiEvent.getPageY();
- System.out.println(String.format("x = %s; y = %s", mouseX, mouseY));
nsIDOMNode originalNode = vpeController.getVisualBuilder()
.getOriginalTargetNode(event);
if (originalNode == null || originalNode.getParentNode() == null ||
14 years, 1 month
JBoss Tools SVN: r21137 - trunk/vpe/tests/org.jboss.tools.vpe.test/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2010-03-30 09:48:45 -0400 (Tue, 30 Mar 2010)
New Revision: 21137
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.test/META-INF/MANIFEST.MF
Log:
https://jira.jboss.org/jira/browse/JBDS-486, vpe and jsf cycle dependency has been resolved
Modified: trunk/vpe/tests/org.jboss.tools.vpe.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.test/META-INF/MANIFEST.MF 2010-03-30 13:36:44 UTC (rev 21136)
+++ trunk/vpe/tests/org.jboss.tools.vpe.test/META-INF/MANIFEST.MF 2010-03-30 13:48:45 UTC (rev 21137)
@@ -9,9 +9,9 @@
org.eclipse.core.runtime,
org.junit,
org.jboss.tools.vpe,
- org.jboss.tools.jsf.vpe.jsf.test,
org.jboss.tools.common.model.ui;bundle-version="2.0.0",
- org.eclipse.jface.text;bundle-version="3.4.0"
+ org.eclipse.jface.text;bundle-version="3.4.0",
+ org.jboss.tools.vpe.ui.test;bundle-version="1.0.0"
Bundle-ActivationPolicy: lazy
Export-Package: org.jboss.tools.vpe.editor.template,
org.jboss.tools.vpe.test
14 years, 1 month