some renames for consistency

datanucleus · Jun 10, 2014 · 26e0294 · 26e0294
1 parent 798c433
commit 26e0294
Show file tree

Hide file tree

Showing 4 changed files with 75 additions and 82 deletions.
diff --git a/plugin.xml b/plugin.xml
@@ -114,7 +114,7 @@
                 <separator name="group"/>
             </menu>
             <action label="Create Application ID Inner Class" id="datanucleus-eclipse.contribution.file.actions.createinner"
-               class="org.datanucleus.ide.eclipse.popup.actions.CreateAppId" menubarPath="datanucleus-eclipse.contribution.file.menu/group"/>
+               class="org.datanucleus.ide.eclipse.popup.actions.CreateAppIdAction" menubarPath="datanucleus-eclipse.contribution.file.menu/group"/>
         </objectContribution>
 
         <!-- Create PK, and Create XML metadata popup menu -->
@@ -126,7 +126,7 @@
                 <separator name="group"/>
             </menu>
             <action label="Create Application ID Inner Class" id="datanucleus-eclipse.contribution.compilation.actions.createinner"
-               class="org.datanucleus.ide.eclipse.popup.actions.CreateAppId" menubarPath="datanucleus-eclipse.contribution.compilation.menu/group"/>
+               class="org.datanucleus.ide.eclipse.popup.actions.CreateAppIdAction" menubarPath="datanucleus-eclipse.contribution.compilation.menu/group"/>
             <action label="Create JDO XML Metadata File" id="datanucleus-eclipse.contribution.compilation.actions.createmetadata"
                class="org.datanucleus.ide.eclipse.popup.actions.CreateMetadataAction" menubarPath="datanucleus-eclipse.contribution.compilation.menu/group"/>
         </objectContribution>

diff --git a/src/java/org/datanucleus/ide/eclipse/popup/actions/CreateAppId.java b/src/java/org/datanucleus/ide/eclipse/popup/actions/CreateAppId.java
diff --git a/src/java/org/datanucleus/ide/eclipse/popup/actions/CreateAppIdAction.java b/src/java/org/datanucleus/ide/eclipse/popup/actions/CreateAppIdAction.java
@@ -0,0 +1,58 @@
+/**********************************************************************
+Copyright (c) 2004 Erik Bengtson and others. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Contributors:
+ ...
+**********************************************************************/
+package org.datanucleus.ide.eclipse.popup.actions;
+
+import org.datanucleus.ide.eclipse.wizard.createappid.JDOApplicationIdWizard;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.ui.IActionDelegate;
+
+/**
+ * Action to create an internal PK class for a persistable class.
+ */
+public class CreateAppIdAction extends JavaProjectAction
+{
+    /**
+     * Constructor for SchemaToolAction.
+     */
+    public CreateAppIdAction()
+    {
+        super();
+    }
+
+    /**
+     * @see IActionDelegate#run(IAction)
+     */
+    public void run(IAction action)
+    {
+        // Instantiates and initializes the wizard
+        JDOApplicationIdWizard wizard = new JDOApplicationIdWizard();
+        ISelection selection = getSelection();
+        if ((selection instanceof IStructuredSelection) || (selection == null))
+        {
+            wizard.init(getActivePart().getSite().getWorkbenchWindow().getWorkbench(), (IStructuredSelection) selection);
+        }
+
+        // Instantiates the wizard container with the wizard and opens it
+        WizardDialog dialog = new WizardDialog(getActivePart().getSite().getShell(), wizard);
+        dialog.create();
+        dialog.open();
+    }
+}
diff --git a/src/java/org/datanucleus/ide/eclipse/popup/actions/CreateMetadataAction.java b/src/java/org/datanucleus/ide/eclipse/popup/actions/CreateMetadataAction.java
@@ -1,12 +1,20 @@
 /**********************************************************************
- Copyright (c) 2005 Michael Grundmann and others.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the JPOX License v1.0
- which accompanies this distribution. 
+Copyright (c) 2005 Michael Grundmann and others. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
 
- Contributors:
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Contributors:
  ...
- **********************************************************************/
+**********************************************************************/
 package org.datanucleus.ide.eclipse.popup.actions;
 
 import org.datanucleus.ide.eclipse.wizard.createmetadata.MetadataCreationWizard;
@@ -16,7 +24,7 @@
 import org.eclipse.jface.wizard.WizardDialog;
 
 /**
- * 
+ * Action to create a JDO package.jdo file.
  */
 public class CreateMetadataAction extends JavaProjectAction
 {