diff --git a/build.gradle b/build.gradle index 191f3c91d..c52aa27ab 100644 --- a/build.gradle +++ b/build.gradle @@ -334,7 +334,7 @@ task testsJar(type: Jar, dependsOn: testClasses) { archiveClassifier = 'tests' from sourceSets.test.output - exclude 'gov/nasa/jpl/mbee/mdk/test/framework/**' + exclude 'org/openmbee/mdk/test/framework/**' exclude 'org/**' exclude 'worker/**' //include 'gov/nasa/jpl/mbee/mdk/test/tests/**' @@ -344,14 +344,14 @@ task testsHackJar(type: Jar, dependsOn: testClasses) { archiveClassifier = 'tests-hack' from sourceSets.test.output - include 'gov/nasa/jpl/mbee/mdk/test/framework/**' + include 'org/openmbee/mdk/test/framework/**' include 'org/**' include 'worker/**' //exclude 'gov/nasa/jpl/mbee/mdk/test/tests/**' manifest { attributes( - 'Main-Class': 'gov.nasa.jpl.mbee.mdk.test.framework.GradleMagicDrawLauncher' + 'Main-Class': 'org.openmbee.mdk.test.framework.GradleMagicDrawLauncher' ) } } @@ -615,7 +615,7 @@ task runJava(type: JavaExec) { executable = profiles["executablePath"] } main = 'com.nomagic.magicdraw.Main' - jvmArgs = ['--module-path', 'plugins/gov.nasa.jpl.cae.magicdraw.mdk/javafx', '--add-modules', 'javafx.controls,javafx.swing,javafx.fxml', '-Xmx8192M', '-Xss512M', '-DLOCALCONFIG=true', '-DWINCONFIG=true', '-Djsse.enableSNIExtension=true', '-Djava.net.preferIPv4Stack=true', '-Dcom.sun.media.imageio.disableCodecLib=true', '-noverify', '-Dlocal.config.dir.ext=-dev', '-splash:data/splash.png', '-Dmd.class.path=$java.class.path', '-Desi.system.config=data/application.conf', '-Dlogback.configurationFile=data/logback.xml', '-Dsun.locale.formatasdefault=true', '-Djdk.attach.allowAttachSelf=true'] + jvmArgs = ['--module-path', 'plugins/org.openmbee.mdk/javafx', '--add-modules', 'javafx.controls,javafx.swing,javafx.fxml', '-Xmx8192M', '-Xss512M', '-DLOCALCONFIG=true', '-DWINCONFIG=true', '-Djsse.enableSNIExtension=true', '-Djava.net.preferIPv4Stack=true', '-Dcom.sun.media.imageio.disableCodecLib=true', '-noverify', '-Dlocal.config.dir.ext=-dev', '-splash:data/splash.png', '-Dmd.class.path=$java.class.path', '-Desi.system.config=data/application.conf', '-Dlogback.configurationFile=data/logback.xml', '-Dsun.locale.formatasdefault=true', '-Djdk.attach.allowAttachSelf=true'] // arguments to pass to the application args 'DEVELOPER' } @@ -633,7 +633,7 @@ task testAVG(type: JavaExec) { errorOutput = System.err main = 'com.nomagic.magicdraw.Main' - jvmArgs = ['-Xmx8192M', '-Xss512M', '-DLOCALCONFIG=true', '-DWINCONFIG=true', '-Djsse.enableSNIExtension=true', '-Djava.net.preferIPv4Stack=true', '-Dcom.sun.media.imageio.disableCodecLib=true', '-noverify', '-Dlocal.config.dir.ext=-dev', '-splash:data/splash.png', '-Dmd.class.path=$java.class.path', '-Desi.system.config=data/application.conf', '-Dlogback.configurationFile=data/logback.xml', '-Dsun.locale.formatasdefault=true', '-Dcom.nomagic.magicdraw.launcher=com.nomagic.magicdraw.commandline.CommandLineActionLauncher', '-Dcom.nomagic.magicdraw.commandline.action=gov.nasa.jpl.mbee.pma.cli.AutomatedViewGenerator'] + jvmArgs = ['-Xmx8192M', '-Xss512M', '-DLOCALCONFIG=true', '-DWINCONFIG=true', '-Djsse.enableSNIExtension=true', '-Djava.net.preferIPv4Stack=true', '-Dcom.sun.media.imageio.disableCodecLib=true', '-noverify', '-Dlocal.config.dir.ext=-dev', '-splash:data/splash.png', '-Dmd.class.path=$java.class.path', '-Desi.system.config=data/application.conf', '-Dlogback.configurationFile=data/logback.xml', '-Dsun.locale.formatasdefault=true', '-Dcom.nomagic.magicdraw.launcher=com.nomagic.magicdraw.commandline.CommandLineActionLauncher', '-Dcom.nomagic.magicdraw.commandline.action=org.openmbee.pma.cli.AutomatedViewGenerator'] } testAVG.dependsOn installDist diff --git a/gradle.properties b/gradle.properties index bb1c5dfdc..a2c7f2daa 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ version=6.0.0 group=org.openmbee.mdk.magic descriptorFile=MDR_Plugin_Model_Development_Kit_91110_descriptor.xml -magicdDrawGroupName=gov.nasa.jpl.cae.magicdraw.mdk +magicdDrawGroupName=org.openmbee.mdk # Add the following secrets via project properties, as applicable. Options include in ~/.gradle/gradle.properties file, # environment variables, or command line arguments, ref: diff --git a/src/main/dist/DocGenUserScripts/examples/HelloWorldParagraph.py b/src/main/dist/DocGenUserScripts/examples/HelloWorldParagraph.py index 71b44542a..7047187d9 100644 --- a/src/main/dist/DocGenUserScripts/examples/HelloWorldParagraph.py +++ b/src/main/dist/DocGenUserScripts/examples/HelloWorldParagraph.py @@ -1,3 +1,3 @@ -from gov.nasa.jpl.mbee.mdk.docgen.docbook import DBParagraph +from org.openmbee.mdk.docgen.docbook import DBParagraph -scriptOutput = [DBParagraph("Hello World")] \ No newline at end of file +scriptOutput = [DBParagraph("Hello World")] diff --git a/src/main/dist/bin/cli/automatedcommitter.sh b/src/main/dist/bin/cli/automatedcommitter.sh index 41141a705..d86287bc4 100755 --- a/src/main/dist/bin/cli/automatedcommitter.sh +++ b/src/main/dist/bin/cli/automatedcommitter.sh @@ -65,7 +65,7 @@ java -Xmx8192M -Xss1024M -DLOCALCONFIG=true -DWINCONFIG=true \ -Dcom.sun.media.imageio.disableCodecLib=true \ -Dsun.locale.formatasdefault=true \ -Dcom.nomagic.magicdraw.launcher=com.nomagic.magicdraw.commandline.CommandLineActionLauncher \ - -Dcom.nomagic.magicdraw.commandline.action=gov.nasa.jpl.mbee.mdk.cli.AutomatedCommitter \ + -Dcom.nomagic.magicdraw.commandline.action=org.openmbee.mdk.cli.AutomatedCommitter \ com.nomagic.osgi.launcher.ProductionFrameworkLauncher -verbose "$@" exit $? diff --git a/src/main/dist/bin/cli/automatedviewgenerator.sh b/src/main/dist/bin/cli/automatedviewgenerator.sh index e5846c3b0..3b88afb7a 100755 --- a/src/main/dist/bin/cli/automatedviewgenerator.sh +++ b/src/main/dist/bin/cli/automatedviewgenerator.sh @@ -48,7 +48,7 @@ java -Xmx8192M -Xss1024M -DLOCALCONFIG=true -DWINCONFIG=true \ -Dcom.sun.media.imageio.disableCodecLib=true \ -Dsun.locale.formatasdefault=true \ -Dcom.nomagic.magicdraw.launcher=com.nomagic.magicdraw.commandline.CommandLineActionLauncher \ - -Dcom.nomagic.magicdraw.commandline.action=gov.nasa.jpl.mbee.mdk.cli.AutomatedViewGenerator \ + -Dcom.nomagic.magicdraw.commandline.action=org.openmbee.mdk.cli.AutomatedViewGenerator \ com.nomagic.osgi.launcher.ProductionFrameworkLauncher -verbose "$@" exit $? diff --git a/src/main/dist/data/defaults/data/diagrams/View Diagram/descriptor.xml b/src/main/dist/data/defaults/data/diagrams/View Diagram/descriptor.xml index ec709c226..3a774de39 100644 --- a/src/main/dist/data/defaults/data/diagrams/View Diagram/descriptor.xml +++ b/src/main/dist/data/defaults/data/diagrams/View Diagram/descriptor.xml @@ -1,6 +1,6 @@ - gov.nasa.jpl.mbee.mdk#Model Development Kit;SysML Extensions.mdxml;UML_Standard_Profile.mdzip + org.openmbee.mdk#Model Development Kit;SysML Extensions.mdxml;UML_Standard_Profile.mdzip diff --git a/src/main/dist/data/defaults/data/diagrams/Viewpoint Method Diagram/descriptor.xml b/src/main/dist/data/defaults/data/diagrams/Viewpoint Method Diagram/descriptor.xml index 8d10f390f..0cc6ec18b 100644 --- a/src/main/dist/data/defaults/data/diagrams/Viewpoint Method Diagram/descriptor.xml +++ b/src/main/dist/data/defaults/data/diagrams/Viewpoint Method Diagram/descriptor.xml @@ -1,6 +1,6 @@ - gov.nasa.jpl.mbee.mdk#Model Development Kit;SysML Extensions.mdxml;UML_Standard_Profile.mdzip + org.openmbee.mdk#Model Development Kit;SysML Extensions.mdxml;UML_Standard_Profile.mdzip diff --git a/src/main/dist/plugins/gov.nasa.jpl.cae.magicdraw.mdk/docbook-xsl/fo/mdk-default.xsl b/src/main/dist/plugins/org.openmbee.mdk/docbook-xsl/fo/mdk-default.xsl similarity index 100% rename from src/main/dist/plugins/gov.nasa.jpl.cae.magicdraw.mdk/docbook-xsl/fo/mdk-default.xsl rename to src/main/dist/plugins/org.openmbee.mdk/docbook-xsl/fo/mdk-default.xsl diff --git a/src/main/dist/plugins/gov.nasa.jpl.cae.magicdraw.mdk/mandatory.profiles b/src/main/dist/plugins/org.openmbee.mdk/mandatory.profiles similarity index 100% rename from src/main/dist/plugins/gov.nasa.jpl.cae.magicdraw.mdk/mandatory.profiles rename to src/main/dist/plugins/org.openmbee.mdk/mandatory.profiles diff --git a/src/main/dist/template/data/resourcemanager/MDR_Plugin_Model_Development_Kit_91110_descriptor.xml b/src/main/dist/template/data/resourcemanager/MDR_Plugin_Model_Development_Kit_91110_descriptor.xml index 9835baca1..10c5e4170 100644 --- a/src/main/dist/template/data/resourcemanager/MDR_Plugin_Model_Development_Kit_91110_descriptor.xml +++ b/src/main/dist/template/data/resourcemanager/MDR_Plugin_Model_Development_Kit_91110_descriptor.xml @@ -7,7 +7,7 @@ mdVersionMax="higher" mdVersionMin="18.4" name="Model Development Kit" - product="JPL Model Development Kit" + product="Model Development Kit" type="Plugin"> diff --git a/src/main/dist/template/plugins/${group}/plugin.xml b/src/main/dist/template/plugins/${group}/plugin.xml index 053e5ad1a..b8d770db3 100644 --- a/src/main/dist/template/plugins/${group}/plugin.xml +++ b/src/main/dist/template/plugins/${group}/plugin.xml @@ -1,11 +1,11 @@ + class="org.openmbee.mdk.MDKPlugin"> diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/MDKApplication.java b/src/main/java/org/openmbee/mdk/MDKApplication.java similarity index 96% rename from src/main/java/gov/nasa/jpl/mbee/mdk/MDKApplication.java rename to src/main/java/org/openmbee/mdk/MDKApplication.java index 894d95fd5..a1aeccccf 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/MDKApplication.java +++ b/src/main/java/org/openmbee/mdk/MDKApplication.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk; +package org.openmbee.mdk; import javafx.application.Application; import javafx.application.Platform; @@ -32,4 +32,4 @@ protected static MDKApplication getInstance() { public static void main(String... args) { Application.launch(MDKApplication.class); } -} \ No newline at end of file +} diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/MDKConfigurator.java b/src/main/java/org/openmbee/mdk/MDKConfigurator.java similarity index 93% rename from src/main/java/gov/nasa/jpl/mbee/mdk/MDKConfigurator.java rename to src/main/java/org/openmbee/mdk/MDKConfigurator.java index 876e8b89d..ac5fd0f12 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/MDKConfigurator.java +++ b/src/main/java/org/openmbee/mdk/MDKConfigurator.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk; +package org.openmbee.mdk; import com.nomagic.actions.AMConfigurator; import com.nomagic.actions.ActionsCategory; @@ -17,24 +17,25 @@ import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.NamedElement; import com.nomagic.uml2.ext.magicdraw.mdprofiles.Stereotype; -import gov.nasa.jpl.mbee.mdk.actions.*; -import gov.nasa.jpl.mbee.mdk.docgen.actions.ValidateAllViewsAction; -import gov.nasa.jpl.mbee.mdk.docgen.actions.ValidateViewAction; -import gov.nasa.jpl.mbee.mdk.docgen.actions.PreviewDocumentAction; -import gov.nasa.jpl.mbee.mdk.generator.DocumentGenerator; -import gov.nasa.jpl.mbee.mdk.migrate.actions.GroupsMigrationAction; -import gov.nasa.jpl.mbee.mdk.mms.actions.*; -import gov.nasa.jpl.mbee.mdk.model.CollectActionsVisitor; -import gov.nasa.jpl.mbee.mdk.model.Document; -import gov.nasa.jpl.mbee.mdk.model.UserScript; -import gov.nasa.jpl.mbee.mdk.model.actions.RunUserScriptAction; -import gov.nasa.jpl.mbee.mdk.model.actions.RunUserValidationScriptAction; -import gov.nasa.jpl.mbee.mdk.ocl.actions.OclQueryAction; -import gov.nasa.jpl.mbee.mdk.options.MDKProjectOptions; -import gov.nasa.jpl.mbee.mdk.util.MDUtils; -import gov.nasa.jpl.mbee.mdk.util.TicketUtils; -import gov.nasa.jpl.mbee.mdk.util.Utils; -import gov.nasa.jpl.mbee.mdk.util.Utils2; +import org.openmbee.mdk.docgen.actions.ValidateAllViewsAction; +import org.openmbee.mdk.docgen.actions.ValidateViewAction; +import org.openmbee.mdk.docgen.actions.PreviewDocumentAction; +import org.openmbee.mdk.generator.DocumentGenerator; +import org.openmbee.mdk.migrate.actions.GroupsMigrationAction; +import org.openmbee.mdk.model.CollectActionsVisitor; +import org.openmbee.mdk.model.Document; +import org.openmbee.mdk.model.UserScript; +import org.openmbee.mdk.model.actions.RunUserScriptAction; +import org.openmbee.mdk.model.actions.RunUserValidationScriptAction; +import org.openmbee.mdk.ocl.actions.OclQueryAction; +import org.openmbee.mdk.options.MDKProjectOptions; +import org.openmbee.mdk.util.MDUtils; +import org.openmbee.mdk.util.TicketUtils; +import org.openmbee.mdk.util.Utils; +import org.openmbee.mdk.util.Utils2; +import org.openmbee.mdk.actions.InstanceViewpointAction; +import org.openmbee.mdk.actions.MMSViewLinkAction; +import org.openmbee.mdk.mms.actions.*; import java.util.*; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/MDKPlugin.java b/src/main/java/org/openmbee/mdk/MDKPlugin.java similarity index 97% rename from src/main/java/gov/nasa/jpl/mbee/mdk/MDKPlugin.java rename to src/main/java/org/openmbee/mdk/MDKPlugin.java index aea03a304..b4d4cae82 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/MDKPlugin.java +++ b/src/main/java/org/openmbee/mdk/MDKPlugin.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk; +package org.openmbee.mdk; import com.nomagic.actions.ActionsCategory; import com.nomagic.actions.ActionsManager; @@ -123,7 +123,7 @@ private void initJavaFX() { } new Thread(() -> { try { - Class clazz = Class.forName("gov.nasa.jpl.mbee.mdk.MDKApplication"); + Class clazz = Class.forName("org.openmbee.mdk.MDKApplication"); Method method = clazz.getMethod("main", String[].class); // has to be before invocation since it hangs MDKPlugin.JAVAFX_SUPPORTED = true; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/MDKPluginHelper.java b/src/main/java/org/openmbee/mdk/MDKPluginHelper.java similarity index 89% rename from src/main/java/gov/nasa/jpl/mbee/mdk/MDKPluginHelper.java rename to src/main/java/org/openmbee/mdk/MDKPluginHelper.java index c30b2c203..5ed50c2b7 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/MDKPluginHelper.java +++ b/src/main/java/org/openmbee/mdk/MDKPluginHelper.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk; +package org.openmbee.mdk; import com.nomagic.magicdraw.actions.ActionsConfiguratorsManager; import com.nomagic.magicdraw.commandline.CommandLineActionManager; @@ -7,12 +7,12 @@ import com.nomagic.magicdraw.evaluation.EvaluationConfigurator; import com.nomagic.magicdraw.uml.DiagramDescriptor; import com.nomagic.magicdraw.uml.DiagramTypeConstants; -import gov.nasa.jpl.mbee.mdk.cli.AutomatedCommitter; -import gov.nasa.jpl.mbee.mdk.cli.AutomatedViewGenerator; -import gov.nasa.jpl.mbee.mdk.mms.sync.status.SyncStatusConfigurator; -import gov.nasa.jpl.mbee.mdk.options.ConfigureProjectOptions; -import gov.nasa.jpl.mbee.mdk.options.MDKEnvironmentOptionsGroup; -import gov.nasa.jpl.mbee.mdk.util.MDUtils; +import org.openmbee.mdk.cli.AutomatedCommitter; +import org.openmbee.mdk.cli.AutomatedViewGenerator; +import org.openmbee.mdk.mms.sync.status.SyncStatusConfigurator; +import org.openmbee.mdk.options.ConfigureProjectOptions; +import org.openmbee.mdk.options.MDKEnvironmentOptionsGroup; +import org.openmbee.mdk.util.MDUtils; public class MDKPluginHelper { diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/MDKProjectOptionsConfigurator.java b/src/main/java/org/openmbee/mdk/MDKProjectOptionsConfigurator.java similarity index 69% rename from src/main/java/gov/nasa/jpl/mbee/mdk/MDKProjectOptionsConfigurator.java rename to src/main/java/org/openmbee/mdk/MDKProjectOptionsConfigurator.java index b304ae4ab..a703ab8e2 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/MDKProjectOptionsConfigurator.java +++ b/src/main/java/org/openmbee/mdk/MDKProjectOptionsConfigurator.java @@ -1,10 +1,10 @@ -package gov.nasa.jpl.mbee.mdk; +package org.openmbee.mdk; import com.nomagic.magicdraw.core.options.ProjectOptions; import com.nomagic.magicdraw.core.options.ProjectOptionsConfigurator; -import gov.nasa.jpl.mbee.mdk.options.MDKProjectOptions; -import gov.nasa.jpl.mbee.mdk.options.listener.MDKProjectOptionsChangeListener; -import gov.nasa.jpl.mbee.mdk.options.listener.MDKProjectPartLoadedListener; +import org.openmbee.mdk.options.MDKProjectOptions; +import org.openmbee.mdk.options.listener.MDKProjectOptionsChangeListener; +import org.openmbee.mdk.options.listener.MDKProjectPartLoadedListener; public class MDKProjectOptionsConfigurator implements ProjectOptionsConfigurator { diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/MMSConfigurator.java b/src/main/java/org/openmbee/mdk/MMSConfigurator.java similarity index 83% rename from src/main/java/gov/nasa/jpl/mbee/mdk/MMSConfigurator.java rename to src/main/java/org/openmbee/mdk/MMSConfigurator.java index 19d555bb5..296d04bfb 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/MMSConfigurator.java +++ b/src/main/java/org/openmbee/mdk/MMSConfigurator.java @@ -1,14 +1,14 @@ -package gov.nasa.jpl.mbee.mdk; +package org.openmbee.mdk; import com.nomagic.actions.AMConfigurator; import com.nomagic.actions.ActionsCategory; import com.nomagic.actions.ActionsManager; import com.nomagic.actions.NMAction; import com.nomagic.magicdraw.actions.MDActionsCategory; -import gov.nasa.jpl.mbee.mdk.mms.actions.GenerateAllViewsAction; -import gov.nasa.jpl.mbee.mdk.mms.actions.MMSLoginAction; -import gov.nasa.jpl.mbee.mdk.mms.actions.MMSLogoutAction; -import gov.nasa.jpl.mbee.mdk.mms.actions.ValidateBranchesAction; +import org.openmbee.mdk.mms.actions.GenerateAllViewsAction; +import org.openmbee.mdk.mms.actions.MMSLoginAction; +import org.openmbee.mdk.mms.actions.MMSLogoutAction; +import org.openmbee.mdk.mms.actions.ValidateBranchesAction; public class MMSConfigurator implements AMConfigurator { diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/MMSSyncPlugin.java b/src/main/java/org/openmbee/mdk/MMSSyncPlugin.java similarity index 87% rename from src/main/java/gov/nasa/jpl/mbee/mdk/MMSSyncPlugin.java rename to src/main/java/org/openmbee/mdk/MMSSyncPlugin.java index 14efb055c..f261406ff 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/MMSSyncPlugin.java +++ b/src/main/java/org/openmbee/mdk/MMSSyncPlugin.java @@ -1,15 +1,15 @@ -package gov.nasa.jpl.mbee.mdk; +package org.openmbee.mdk; import com.nomagic.magicdraw.cookies.CloseCookie; import com.nomagic.magicdraw.cookies.CookieSet; import com.nomagic.magicdraw.core.Application; import com.nomagic.magicdraw.plugins.Plugin; -import gov.nasa.jpl.mbee.mdk.mms.sync.coordinated.CoordinatedSyncProjectEventListenerAdapter; -import gov.nasa.jpl.mbee.mdk.mms.sync.delta.DeltaSyncProjectEventListenerAdapter; -import gov.nasa.jpl.mbee.mdk.mms.sync.local.LocalDeltaProjectEventListenerAdapter; -import gov.nasa.jpl.mbee.mdk.mms.sync.mms.MMSDeltaProjectEventListenerAdapter; -import gov.nasa.jpl.mbee.mdk.mms.sync.status.SyncStatusProjectEventListenerAdapter; -import gov.nasa.jpl.mbee.mdk.util.TaskRunner; +import org.openmbee.mdk.mms.sync.coordinated.CoordinatedSyncProjectEventListenerAdapter; +import org.openmbee.mdk.mms.sync.delta.DeltaSyncProjectEventListenerAdapter; +import org.openmbee.mdk.mms.sync.local.LocalDeltaProjectEventListenerAdapter; +import org.openmbee.mdk.mms.sync.mms.MMSDeltaProjectEventListenerAdapter; +import org.openmbee.mdk.mms.sync.status.SyncStatusProjectEventListenerAdapter; +import org.openmbee.mdk.util.TaskRunner; /* * This class is responsible for performing automatic syncs with diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/SysMLExtensions.java b/src/main/java/org/openmbee/mdk/SysMLExtensions.java similarity index 99% rename from src/main/java/gov/nasa/jpl/mbee/mdk/SysMLExtensions.java rename to src/main/java/org/openmbee/mdk/SysMLExtensions.java index 85583809c..3d4d93562 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/SysMLExtensions.java +++ b/src/main/java/org/openmbee/mdk/SysMLExtensions.java @@ -1,16 +1,13 @@ -package gov.nasa.jpl.mbee.mdk; +package org.openmbee.mdk; // Generated by Developer Tools Plugin: Generate Profile Class Implementation (wrappers) -import com.nomagic.annotation.OpenApiAll; import com.nomagic.magicdraw.uml.BaseElement; import com.nomagic.magicdraw.uml2.Profiles; import com.nomagic.profiles.ProfileCache; import com.nomagic.profiles.ProfileImplementation; import com.nomagic.profiles.ProfilesBridge; -import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Package; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.*; -import com.nomagic.uml2.ext.magicdraw.mdprofiles.Profile; import com.nomagic.uml2.ext.magicdraw.mdprofiles.Stereotype; import com.nomagic.uml2.project.ElementProject; import javax.annotation.CheckForNull; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/ViewDiagramConfigurator.java b/src/main/java/org/openmbee/mdk/ViewDiagramConfigurator.java similarity index 93% rename from src/main/java/gov/nasa/jpl/mbee/mdk/ViewDiagramConfigurator.java rename to src/main/java/org/openmbee/mdk/ViewDiagramConfigurator.java index 4839f084b..028e3f273 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/ViewDiagramConfigurator.java +++ b/src/main/java/org/openmbee/mdk/ViewDiagramConfigurator.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk; +package org.openmbee.mdk; import com.nomagic.actions.AMConfigurator; import com.nomagic.actions.ActionsManager; @@ -6,7 +6,7 @@ import com.nomagic.magicdraw.actions.TargetElementAMConfigurator; import com.nomagic.magicdraw.ui.diagrams.BaseCustomizableDiagramAction; import com.nomagic.magicdraw.uml.symbols.PresentationElement; -import gov.nasa.jpl.mbee.mdk.actions.ViewpointAdditionalDrawAction; +import org.openmbee.mdk.actions.ViewpointAdditionalDrawAction; import java.util.Collections; import java.util.Iterator; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/actions/ClipboardAction.java b/src/main/java/org/openmbee/mdk/actions/ClipboardAction.java similarity index 95% rename from src/main/java/gov/nasa/jpl/mbee/mdk/actions/ClipboardAction.java rename to src/main/java/org/openmbee/mdk/actions/ClipboardAction.java index 0a83559c6..cff254788 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/actions/ClipboardAction.java +++ b/src/main/java/org/openmbee/mdk/actions/ClipboardAction.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.actions; +package org.openmbee.mdk.actions; import com.nomagic.magicdraw.actions.MDAction; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/actions/CreateRestrictedValueAction.java b/src/main/java/org/openmbee/mdk/actions/CreateRestrictedValueAction.java similarity index 99% rename from src/main/java/gov/nasa/jpl/mbee/mdk/actions/CreateRestrictedValueAction.java rename to src/main/java/org/openmbee/mdk/actions/CreateRestrictedValueAction.java index 2f182db66..992d3e4e0 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/actions/CreateRestrictedValueAction.java +++ b/src/main/java/org/openmbee/mdk/actions/CreateRestrictedValueAction.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.actions; +package org.openmbee.mdk.actions; import com.nomagic.magicdraw.actions.MDAction; import com.nomagic.magicdraw.core.Application; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/actions/InstanceViewpointAction.java b/src/main/java/org/openmbee/mdk/actions/InstanceViewpointAction.java similarity index 97% rename from src/main/java/gov/nasa/jpl/mbee/mdk/actions/InstanceViewpointAction.java rename to src/main/java/org/openmbee/mdk/actions/InstanceViewpointAction.java index 643122a78..8bb54bd97 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/actions/InstanceViewpointAction.java +++ b/src/main/java/org/openmbee/mdk/actions/InstanceViewpointAction.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.actions; +package org.openmbee.mdk.actions; import com.nomagic.magicdraw.actions.MDAction; import com.nomagic.magicdraw.core.Application; @@ -13,8 +13,8 @@ import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Package; import com.nomagic.uml2.ext.magicdraw.mdprofiles.Stereotype; import com.nomagic.uml2.impl.ElementsFactory; -import gov.nasa.jpl.mbee.mdk.SysMLExtensions; -import gov.nasa.jpl.mbee.mdk.util.Utils; +import org.openmbee.mdk.SysMLExtensions; +import org.openmbee.mdk.util.Utils; import java.awt.event.ActionEvent; import java.io.PrintWriter; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/actions/LockAction.java b/src/main/java/org/openmbee/mdk/actions/LockAction.java similarity index 98% rename from src/main/java/gov/nasa/jpl/mbee/mdk/actions/LockAction.java rename to src/main/java/org/openmbee/mdk/actions/LockAction.java index d9c283aa7..b9c3c217e 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/actions/LockAction.java +++ b/src/main/java/org/openmbee/mdk/actions/LockAction.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.actions; +package org.openmbee.mdk.actions; import com.nomagic.magicdraw.actions.MDAction; import com.nomagic.magicdraw.annotation.Annotation; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/actions/MMSViewLinkAction.java b/src/main/java/org/openmbee/mdk/actions/MMSViewLinkAction.java similarity index 96% rename from src/main/java/gov/nasa/jpl/mbee/mdk/actions/MMSViewLinkAction.java rename to src/main/java/org/openmbee/mdk/actions/MMSViewLinkAction.java index 757f3b261..629d6bc30 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/actions/MMSViewLinkAction.java +++ b/src/main/java/org/openmbee/mdk/actions/MMSViewLinkAction.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.actions; +package org.openmbee.mdk.actions; import com.nomagic.magicdraw.actions.MDAction; import com.nomagic.magicdraw.core.Application; @@ -8,11 +8,11 @@ import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.*; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Class; import com.nomagic.uml2.ext.magicdraw.mdprofiles.Stereotype; -import gov.nasa.jpl.mbee.mdk.SysMLExtensions; -import gov.nasa.jpl.mbee.mdk.api.incubating.convert.Converters; -import gov.nasa.jpl.mbee.mdk.options.MDKProjectOptions; -import gov.nasa.jpl.mbee.mdk.ui.ViewEditorLinkForm; -import gov.nasa.jpl.mbee.mdk.util.MDUtils; +import org.openmbee.mdk.SysMLExtensions; +import org.openmbee.mdk.api.incubating.convert.Converters; +import org.openmbee.mdk.options.MDKProjectOptions; +import org.openmbee.mdk.ui.ViewEditorLinkForm; +import org.openmbee.mdk.util.MDUtils; import org.apache.http.client.utils.URIBuilder; import javax.swing.*; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/actions/ViewpointAdditionalDrawAction.java b/src/main/java/org/openmbee/mdk/actions/ViewpointAdditionalDrawAction.java similarity index 97% rename from src/main/java/gov/nasa/jpl/mbee/mdk/actions/ViewpointAdditionalDrawAction.java rename to src/main/java/org/openmbee/mdk/actions/ViewpointAdditionalDrawAction.java index 91dc40c1a..135d169c8 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/actions/ViewpointAdditionalDrawAction.java +++ b/src/main/java/org/openmbee/mdk/actions/ViewpointAdditionalDrawAction.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.actions; +package org.openmbee.mdk.actions; import com.nomagic.magicdraw.core.Project; import com.nomagic.magicdraw.uml.symbols.PresentationElement; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/api/ElementFinder.java b/src/main/java/org/openmbee/mdk/api/ElementFinder.java similarity index 99% rename from src/main/java/gov/nasa/jpl/mbee/mdk/api/ElementFinder.java rename to src/main/java/org/openmbee/mdk/api/ElementFinder.java index 15c448747..cd8d2a33b 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/api/ElementFinder.java +++ b/src/main/java/org/openmbee/mdk/api/ElementFinder.java @@ -27,7 +27,7 @@ * POSSIBILITY OF SUCH DAMAGE. ******************************************************************************/ -package gov.nasa.jpl.mbee.mdk.api; +package org.openmbee.mdk.api; import com.nomagic.magicdraw.core.Application; import com.nomagic.magicdraw.core.Project; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/api/MDKHelper.java b/src/main/java/org/openmbee/mdk/api/MDKHelper.java similarity index 94% rename from src/main/java/gov/nasa/jpl/mbee/mdk/api/MDKHelper.java rename to src/main/java/org/openmbee/mdk/api/MDKHelper.java index 4e3632cdd..94d400256 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/api/MDKHelper.java +++ b/src/main/java/org/openmbee/mdk/api/MDKHelper.java @@ -27,12 +27,12 @@ * POSSIBILITY OF SUCH DAMAGE. ******************************************************************************/ -package gov.nasa.jpl.mbee.mdk.api; +package org.openmbee.mdk.api; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; -import gov.nasa.jpl.mbee.mdk.mms.actions.GenerateViewPresentationAction; -import gov.nasa.jpl.mbee.mdk.tickets.BasicAuthAcquireTicketProcessor; -import gov.nasa.jpl.mbee.mdk.util.Utils; +import org.openmbee.mdk.mms.actions.GenerateViewPresentationAction; +import org.openmbee.mdk.tickets.BasicAuthAcquireTicketProcessor; +import org.openmbee.mdk.util.Utils; import java.util.Collections; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/api/MDKValidationWindow.java b/src/main/java/org/openmbee/mdk/api/MDKValidationWindow.java similarity index 98% rename from src/main/java/gov/nasa/jpl/mbee/mdk/api/MDKValidationWindow.java rename to src/main/java/org/openmbee/mdk/api/MDKValidationWindow.java index e603ed308..a69c30d47 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/api/MDKValidationWindow.java +++ b/src/main/java/org/openmbee/mdk/api/MDKValidationWindow.java @@ -27,16 +27,16 @@ * POSSIBILITY OF SUCH DAMAGE. ******************************************************************************/ -package gov.nasa.jpl.mbee.mdk.api; +package org.openmbee.mdk.api; import com.nomagic.magicdraw.annotation.Annotation; import com.nomagic.magicdraw.core.Application; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; -import gov.nasa.jpl.mbee.mdk.api.incubating.convert.Converters; -import gov.nasa.jpl.mbee.mdk.util.Utils; -import gov.nasa.jpl.mbee.mdk.validation.ValidationRule; -import gov.nasa.jpl.mbee.mdk.validation.ValidationRuleViolation; -import gov.nasa.jpl.mbee.mdk.validation.ValidationSuite; +import org.openmbee.mdk.api.incubating.convert.Converters; +import org.openmbee.mdk.util.Utils; +import org.openmbee.mdk.validation.ValidationRule; +import org.openmbee.mdk.validation.ValidationRuleViolation; +import org.openmbee.mdk.validation.ValidationSuite; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; @@ -165,7 +165,7 @@ public int listPooledViolations() { try { numViolations += listPooledViolations(s[VIOLATION_RULE_NAME]); } catch (Exception e) { - // do nothing, not a user problem if one of the listed types should be updated + // do nothing, not a user problem if one of the listed types should be updated } } return numViolations; @@ -479,9 +479,9 @@ public Collection confirmElementViolationByID(String validationType, Col /* * Non-reflection method for getting annotations and executing actions. Saved only in case it's instructive for * something later on. Should not be made public or called. - * + * * Exports all [ATTRIBUTE] validation results to MD - * + * * @throws Exception */ // private void exportAllValidatedAttribute() { diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/api/MagicDrawHelper.java b/src/main/java/org/openmbee/mdk/api/MagicDrawHelper.java similarity index 99% rename from src/main/java/gov/nasa/jpl/mbee/mdk/api/MagicDrawHelper.java rename to src/main/java/org/openmbee/mdk/api/MagicDrawHelper.java index afc6142cf..15109e145 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/api/MagicDrawHelper.java +++ b/src/main/java/org/openmbee/mdk/api/MagicDrawHelper.java @@ -27,7 +27,7 @@ * POSSIBILITY OF SUCH DAMAGE. ******************************************************************************/ -package gov.nasa.jpl.mbee.mdk.api; +package org.openmbee.mdk.api; import com.nomagic.magicdraw.core.Application; import com.nomagic.magicdraw.core.Project; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/api/docgen/uml/classes/EquationClass.java b/src/main/java/org/openmbee/mdk/api/docgen/uml/classes/EquationClass.java similarity index 86% rename from src/main/java/gov/nasa/jpl/mbee/mdk/api/docgen/uml/classes/EquationClass.java rename to src/main/java/org/openmbee/mdk/api/docgen/uml/classes/EquationClass.java index 255447496..4d0b9342e 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/api/docgen/uml/classes/EquationClass.java +++ b/src/main/java/org/openmbee/mdk/api/docgen/uml/classes/EquationClass.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.api.docgen.uml.classes; +package org.openmbee.mdk.api.docgen.uml.classes; /** * Created by igomes on 8/23/16. diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/api/docgen/uml/classes/FigureClass.java b/src/main/java/org/openmbee/mdk/api/docgen/uml/classes/FigureClass.java similarity index 86% rename from src/main/java/gov/nasa/jpl/mbee/mdk/api/docgen/uml/classes/FigureClass.java rename to src/main/java/org/openmbee/mdk/api/docgen/uml/classes/FigureClass.java index 055b6c28a..de5e90cbe 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/api/docgen/uml/classes/FigureClass.java +++ b/src/main/java/org/openmbee/mdk/api/docgen/uml/classes/FigureClass.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.api.docgen.uml.classes; +package org.openmbee.mdk.api.docgen.uml.classes; /** * Created by igomes on 8/23/16. diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/api/docgen/uml/classes/ImageClass.java b/src/main/java/org/openmbee/mdk/api/docgen/uml/classes/ImageClass.java similarity index 86% rename from src/main/java/gov/nasa/jpl/mbee/mdk/api/docgen/uml/classes/ImageClass.java rename to src/main/java/org/openmbee/mdk/api/docgen/uml/classes/ImageClass.java index 081966df9..b39349a7d 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/api/docgen/uml/classes/ImageClass.java +++ b/src/main/java/org/openmbee/mdk/api/docgen/uml/classes/ImageClass.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.api.docgen.uml.classes; +package org.openmbee.mdk.api.docgen.uml.classes; /** * Created by igomes on 8/23/16. diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/api/docgen/uml/classes/ListClass.java b/src/main/java/org/openmbee/mdk/api/docgen/uml/classes/ListClass.java similarity index 86% rename from src/main/java/gov/nasa/jpl/mbee/mdk/api/docgen/uml/classes/ListClass.java rename to src/main/java/org/openmbee/mdk/api/docgen/uml/classes/ListClass.java index b990be104..1c79b3f13 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/api/docgen/uml/classes/ListClass.java +++ b/src/main/java/org/openmbee/mdk/api/docgen/uml/classes/ListClass.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.api.docgen.uml.classes; +package org.openmbee.mdk.api.docgen.uml.classes; /** * Created by igomes on 8/23/16. diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/api/docgen/uml/classes/OpaqueFigureClass.java b/src/main/java/org/openmbee/mdk/api/docgen/uml/classes/OpaqueFigureClass.java similarity index 86% rename from src/main/java/gov/nasa/jpl/mbee/mdk/api/docgen/uml/classes/OpaqueFigureClass.java rename to src/main/java/org/openmbee/mdk/api/docgen/uml/classes/OpaqueFigureClass.java index 5bcd12d4b..6254f9fb2 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/api/docgen/uml/classes/OpaqueFigureClass.java +++ b/src/main/java/org/openmbee/mdk/api/docgen/uml/classes/OpaqueFigureClass.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.api.docgen.uml.classes; +package org.openmbee.mdk.api.docgen.uml.classes; /** * Created by igomes on 8/23/16. diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/api/docgen/uml/classes/OpaqueImageClass.java b/src/main/java/org/openmbee/mdk/api/docgen/uml/classes/OpaqueImageClass.java similarity index 86% rename from src/main/java/gov/nasa/jpl/mbee/mdk/api/docgen/uml/classes/OpaqueImageClass.java rename to src/main/java/org/openmbee/mdk/api/docgen/uml/classes/OpaqueImageClass.java index 284af833e..82f550ecc 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/api/docgen/uml/classes/OpaqueImageClass.java +++ b/src/main/java/org/openmbee/mdk/api/docgen/uml/classes/OpaqueImageClass.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.api.docgen.uml.classes; +package org.openmbee.mdk.api.docgen.uml.classes; /** * Created by igomes on 8/23/16. diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/api/docgen/uml/classes/OpaqueListClass.java b/src/main/java/org/openmbee/mdk/api/docgen/uml/classes/OpaqueListClass.java similarity index 86% rename from src/main/java/gov/nasa/jpl/mbee/mdk/api/docgen/uml/classes/OpaqueListClass.java rename to src/main/java/org/openmbee/mdk/api/docgen/uml/classes/OpaqueListClass.java index 64b50c997..71e6a6dee 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/api/docgen/uml/classes/OpaqueListClass.java +++ b/src/main/java/org/openmbee/mdk/api/docgen/uml/classes/OpaqueListClass.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.api.docgen.uml.classes; +package org.openmbee.mdk.api.docgen.uml.classes; /** * Created by igomes on 8/23/16. diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/api/docgen/uml/classes/OpaqueParagraphClass.java b/src/main/java/org/openmbee/mdk/api/docgen/uml/classes/OpaqueParagraphClass.java similarity index 87% rename from src/main/java/gov/nasa/jpl/mbee/mdk/api/docgen/uml/classes/OpaqueParagraphClass.java rename to src/main/java/org/openmbee/mdk/api/docgen/uml/classes/OpaqueParagraphClass.java index 4d87ec4ca..1ca41518c 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/api/docgen/uml/classes/OpaqueParagraphClass.java +++ b/src/main/java/org/openmbee/mdk/api/docgen/uml/classes/OpaqueParagraphClass.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.api.docgen.uml.classes; +package org.openmbee.mdk.api.docgen.uml.classes; /** * Created by igomes on 8/23/16. diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/api/docgen/uml/classes/OpaqueSectionClass.java b/src/main/java/org/openmbee/mdk/api/docgen/uml/classes/OpaqueSectionClass.java similarity index 80% rename from src/main/java/gov/nasa/jpl/mbee/mdk/api/docgen/uml/classes/OpaqueSectionClass.java rename to src/main/java/org/openmbee/mdk/api/docgen/uml/classes/OpaqueSectionClass.java index 58cfbb00e..ce3cc4524 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/api/docgen/uml/classes/OpaqueSectionClass.java +++ b/src/main/java/org/openmbee/mdk/api/docgen/uml/classes/OpaqueSectionClass.java @@ -1,7 +1,7 @@ -package gov.nasa.jpl.mbee.mdk.api.docgen.uml.classes; +package org.openmbee.mdk.api.docgen.uml.classes; -import gov.nasa.jpl.mbee.mdk.api.docgen.uml.classes.properties.PresentationElementClassProperty; -import gov.nasa.jpl.mbee.mdk.api.docgen.uml.classes.properties.PresentationElementClassProperties; +import org.openmbee.mdk.api.docgen.uml.classes.properties.PresentationElementClassProperty; +import org.openmbee.mdk.api.docgen.uml.classes.properties.PresentationElementClassProperties; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/api/docgen/uml/classes/OpaqueTableClass.java b/src/main/java/org/openmbee/mdk/api/docgen/uml/classes/OpaqueTableClass.java similarity index 86% rename from src/main/java/gov/nasa/jpl/mbee/mdk/api/docgen/uml/classes/OpaqueTableClass.java rename to src/main/java/org/openmbee/mdk/api/docgen/uml/classes/OpaqueTableClass.java index bf01054f7..d8e0b8aa2 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/api/docgen/uml/classes/OpaqueTableClass.java +++ b/src/main/java/org/openmbee/mdk/api/docgen/uml/classes/OpaqueTableClass.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.api.docgen.uml.classes; +package org.openmbee.mdk.api.docgen.uml.classes; /** * Created by igomes on 8/23/16. diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/api/docgen/uml/classes/ParagraphClass.java b/src/main/java/org/openmbee/mdk/api/docgen/uml/classes/ParagraphClass.java similarity index 86% rename from src/main/java/gov/nasa/jpl/mbee/mdk/api/docgen/uml/classes/ParagraphClass.java rename to src/main/java/org/openmbee/mdk/api/docgen/uml/classes/ParagraphClass.java index 369f5b028..b3b4b2784 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/api/docgen/uml/classes/ParagraphClass.java +++ b/src/main/java/org/openmbee/mdk/api/docgen/uml/classes/ParagraphClass.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.api.docgen.uml.classes; +package org.openmbee.mdk.api.docgen.uml.classes; /** * Created by igomes on 8/23/16. diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/api/docgen/uml/classes/PresentationElementClass.java b/src/main/java/org/openmbee/mdk/api/docgen/uml/classes/PresentationElementClass.java similarity index 70% rename from src/main/java/gov/nasa/jpl/mbee/mdk/api/docgen/uml/classes/PresentationElementClass.java rename to src/main/java/org/openmbee/mdk/api/docgen/uml/classes/PresentationElementClass.java index 42c20ba57..e64a15a51 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/api/docgen/uml/classes/PresentationElementClass.java +++ b/src/main/java/org/openmbee/mdk/api/docgen/uml/classes/PresentationElementClass.java @@ -1,10 +1,10 @@ -package gov.nasa.jpl.mbee.mdk.api.docgen.uml.classes; +package org.openmbee.mdk.api.docgen.uml.classes; -import gov.nasa.jpl.mbee.mdk.api.docgen.uml.classes.properties.PresentationElementClassProperty; -import gov.nasa.jpl.mbee.mdk.api.docgen.uml.classes.properties.PresentationElementClassProperties; +import org.openmbee.mdk.api.docgen.uml.classes.properties.PresentationElementClassProperty; +import org.openmbee.mdk.api.docgen.uml.classes.properties.PresentationElementClassProperties; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Classifier; -import gov.nasa.jpl.mbee.mdk.api.util.ElementReference; +import org.openmbee.mdk.api.util.ElementReference; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/api/docgen/uml/classes/PresentationElementClasses.java b/src/main/java/org/openmbee/mdk/api/docgen/uml/classes/PresentationElementClasses.java similarity index 94% rename from src/main/java/gov/nasa/jpl/mbee/mdk/api/docgen/uml/classes/PresentationElementClasses.java rename to src/main/java/org/openmbee/mdk/api/docgen/uml/classes/PresentationElementClasses.java index 967b3fa43..25cbf5d05 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/api/docgen/uml/classes/PresentationElementClasses.java +++ b/src/main/java/org/openmbee/mdk/api/docgen/uml/classes/PresentationElementClasses.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.api.docgen.uml.classes; +package org.openmbee.mdk.api.docgen.uml.classes; import java.util.function.Supplier; @@ -30,4 +30,4 @@ public enum PresentationElementClasses implements Supplier characteristics() { return EnumSet.of(Characteristics.UNORDERED); } -} \ No newline at end of file +} diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/api/stream/MDKCollectors.java b/src/main/java/org/openmbee/mdk/api/stream/MDKCollectors.java similarity index 75% rename from src/main/java/gov/nasa/jpl/mbee/mdk/api/stream/MDKCollectors.java rename to src/main/java/org/openmbee/mdk/api/stream/MDKCollectors.java index aa1cf0118..67d5e8462 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/api/stream/MDKCollectors.java +++ b/src/main/java/org/openmbee/mdk/api/stream/MDKCollectors.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.api.stream; +package org.openmbee.mdk.api.stream; public class MDKCollectors { public static ArrayNodeCollector toArrayNode() { diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/api/util/ElementReference.java b/src/main/java/org/openmbee/mdk/api/util/ElementReference.java similarity index 91% rename from src/main/java/gov/nasa/jpl/mbee/mdk/api/util/ElementReference.java rename to src/main/java/org/openmbee/mdk/api/util/ElementReference.java index 0c99fb60f..6203d275b 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/api/util/ElementReference.java +++ b/src/main/java/org/openmbee/mdk/api/util/ElementReference.java @@ -1,9 +1,9 @@ -package gov.nasa.jpl.mbee.mdk.api.util; +package org.openmbee.mdk.api.util; import com.nomagic.magicdraw.core.Project; import com.nomagic.magicdraw.uml.BaseElement; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; -import gov.nasa.jpl.mbee.mdk.api.incubating.convert.Converters; +import org.openmbee.mdk.api.incubating.convert.Converters; import java.util.function.Function; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/cli/AutomatedCommitter.java b/src/main/java/org/openmbee/mdk/cli/AutomatedCommitter.java similarity index 95% rename from src/main/java/gov/nasa/jpl/mbee/mdk/cli/AutomatedCommitter.java rename to src/main/java/org/openmbee/mdk/cli/AutomatedCommitter.java index 2d5d94234..6b2ec906b 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/cli/AutomatedCommitter.java +++ b/src/main/java/org/openmbee/mdk/cli/AutomatedCommitter.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.cli; +package org.openmbee.mdk.cli; import com.beust.jcommander.JCommander; import com.beust.jcommander.Parameter; @@ -11,10 +11,10 @@ import com.nomagic.magicdraw.teamwork2.ServerLoginInfo; import com.nomagic.magicdraw.teamwork2.locks.ILockProjectService; import com.nomagic.magicdraw.teamwork2.locks.LockService; -import gov.nasa.jpl.mbee.mdk.api.MDKHelper; -import gov.nasa.jpl.mbee.mdk.http.ServerException; -import gov.nasa.jpl.mbee.mdk.mms.MMSUtils; -import gov.nasa.jpl.mbee.mdk.util.TaskRunner; +import org.openmbee.mdk.api.MDKHelper; +import org.openmbee.mdk.http.ServerException; +import org.openmbee.mdk.mms.MMSUtils; +import org.openmbee.mdk.util.TaskRunner; import java.util.Arrays; import java.util.Collections; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/cli/AutomatedViewGenerator.java b/src/main/java/org/openmbee/mdk/cli/AutomatedViewGenerator.java similarity index 97% rename from src/main/java/gov/nasa/jpl/mbee/mdk/cli/AutomatedViewGenerator.java rename to src/main/java/org/openmbee/mdk/cli/AutomatedViewGenerator.java index 276fd9f12..ceedaa69f 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/cli/AutomatedViewGenerator.java +++ b/src/main/java/org/openmbee/mdk/cli/AutomatedViewGenerator.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.cli; +package org.openmbee.mdk.cli; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; @@ -10,18 +10,17 @@ import com.nomagic.magicdraw.teamwork2.ITeamworkService; import com.nomagic.magicdraw.teamwork2.ServerLoginInfo; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; -import gov.nasa.jpl.mbee.mdk.api.MDKHelper; -import gov.nasa.jpl.mbee.mdk.api.incubating.MDKConstants; -import gov.nasa.jpl.mbee.mdk.api.incubating.convert.Converters; -import gov.nasa.jpl.mbee.mdk.http.ServerException; -import gov.nasa.jpl.mbee.mdk.json.JacksonUtils; -import gov.nasa.jpl.mbee.mdk.mms.MMSUtils; -import gov.nasa.jpl.mbee.mdk.mms.actions.MMSLoginAction; -import gov.nasa.jpl.mbee.mdk.mms.endpoints.*; -import gov.nasa.jpl.mbee.mdk.options.MDKEnvironmentOptionsGroup; -import gov.nasa.jpl.mbee.mdk.tickets.BasicAuthAcquireTicketProcessor; -import gov.nasa.jpl.mbee.mdk.util.TaskRunner; -import gov.nasa.jpl.mbee.mdk.util.TicketUtils; +import org.openmbee.mdk.api.MDKHelper; +import org.openmbee.mdk.api.incubating.MDKConstants; +import org.openmbee.mdk.api.incubating.convert.Converters; +import org.openmbee.mdk.http.ServerException; +import org.openmbee.mdk.json.JacksonUtils; +import org.openmbee.mdk.mms.MMSUtils; +import org.openmbee.mdk.mms.actions.MMSLoginAction; +import org.openmbee.mdk.options.MDKEnvironmentOptionsGroup; +import org.openmbee.mdk.tickets.BasicAuthAcquireTicketProcessor; +import org.openmbee.mdk.util.TaskRunner; +import org.openmbee.mdk.util.TicketUtils; import org.apache.commons.cli.*; import org.apache.commons.io.IOUtils; import org.apache.http.client.methods.CloseableHttpResponse; @@ -31,6 +30,9 @@ import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; +import org.openmbee.mdk.mms.endpoints.MMSEndpointBuilderConstants; +import org.openmbee.mdk.mms.endpoints.MMSProjectEndpoint; +import org.openmbee.mdk.mms.endpoints.MMSRefEndpoint; import java.io.*; import java.net.HttpURLConnection; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/constraint/BasicConstraint.java b/src/main/java/org/openmbee/mdk/constraint/BasicConstraint.java similarity index 98% rename from src/main/java/gov/nasa/jpl/mbee/mdk/constraint/BasicConstraint.java rename to src/main/java/org/openmbee/mdk/constraint/BasicConstraint.java index f2d0263a7..7d153dea9 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/constraint/BasicConstraint.java +++ b/src/main/java/org/openmbee/mdk/constraint/BasicConstraint.java @@ -1,12 +1,12 @@ -package gov.nasa.jpl.mbee.mdk.constraint; +package org.openmbee.mdk.constraint; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Comment; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; -import gov.nasa.jpl.mbee.mdk.SysMLExtensions; -import gov.nasa.jpl.mbee.mdk.api.incubating.convert.Converters; -import gov.nasa.jpl.mbee.mdk.docgen.DocGenUtils; -import gov.nasa.jpl.mbee.mdk.ocl.OclEvaluator; -import gov.nasa.jpl.mbee.mdk.util.*; +import org.openmbee.mdk.SysMLExtensions; +import org.openmbee.mdk.api.incubating.convert.Converters; +import org.openmbee.mdk.docgen.DocGenUtils; +import org.openmbee.mdk.ocl.OclEvaluator; +import org.openmbee.mdk.util.*; import java.util.*; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/constraint/Constraint.java b/src/main/java/org/openmbee/mdk/constraint/Constraint.java similarity index 95% rename from src/main/java/gov/nasa/jpl/mbee/mdk/constraint/Constraint.java rename to src/main/java/org/openmbee/mdk/constraint/Constraint.java index b7ecea6d0..e14430bb5 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/constraint/Constraint.java +++ b/src/main/java/org/openmbee/mdk/constraint/Constraint.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.constraint; +package org.openmbee.mdk.constraint; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/DocGenUtils.java b/src/main/java/org/openmbee/mdk/docgen/DocGenUtils.java similarity index 98% rename from src/main/java/gov/nasa/jpl/mbee/mdk/docgen/DocGenUtils.java rename to src/main/java/org/openmbee/mdk/docgen/DocGenUtils.java index aa03662f3..9aad6a026 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/DocGenUtils.java +++ b/src/main/java/org/openmbee/mdk/docgen/DocGenUtils.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.docgen; +package org.openmbee.mdk.docgen; import com.nomagic.magicdraw.core.Application; import com.nomagic.magicdraw.core.Project; @@ -9,13 +9,14 @@ import com.nomagic.magicdraw.properties.StringProperty; import com.nomagic.magicdraw.uml.symbols.DiagramPresentationElement; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.*; -import gov.nasa.jpl.mbee.mdk.docgen.docbook.DocumentElement; -import gov.nasa.jpl.mbee.mdk.docgen.view.ViewElement; -import gov.nasa.jpl.mbee.mdk.util.MDUtils; +import org.openmbee.mdk.docgen.docbook.DocumentElement; +import org.openmbee.mdk.docgen.view.ViewElement; +import org.openmbee.mdk.util.MDUtils; import org.apache.commons.lang3.StringEscapeUtils; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.select.Elements; +import org.openmbee.mdk.util.Utils; import javax.xml.transform.TransformerException; import java.io.BufferedReader; @@ -168,7 +169,7 @@ public static String fixString(Object s, boolean convertHtml) { return htmlToXmlEntities((String) s); } else { - return gov.nasa.jpl.mbee.mdk.util.Utils.stripHtmlWrapper((String) s); + return Utils.stripHtmlWrapper((String) s); } } else { @@ -327,7 +328,7 @@ public static String slot2String(Slot s, boolean includeName) { for (ValueSpecification vs : s.getValue()) { values.add(fixString(vs)); } - return string + gov.nasa.jpl.mbee.mdk.util.Utils.join(values, ", "); + return string + Utils.join(values, ", "); } /** diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/DocGenViewDBSwitch.java b/src/main/java/org/openmbee/mdk/docgen/DocGenViewDBSwitch.java similarity index 95% rename from src/main/java/gov/nasa/jpl/mbee/mdk/docgen/DocGenViewDBSwitch.java rename to src/main/java/org/openmbee/mdk/docgen/DocGenViewDBSwitch.java index c95f6b0e1..8b1b8f7ca 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/DocGenViewDBSwitch.java +++ b/src/main/java/org/openmbee/mdk/docgen/DocGenViewDBSwitch.java @@ -1,16 +1,16 @@ -package gov.nasa.jpl.mbee.mdk.docgen; +package org.openmbee.mdk.docgen; import com.nomagic.magicdraw.core.Application; import com.nomagic.magicdraw.uml.BaseElement; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Diagram; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; -import gov.nasa.jpl.mbee.mdk.api.incubating.convert.Converters; -import gov.nasa.jpl.mbee.mdk.docgen.docbook.*; -import gov.nasa.jpl.mbee.mdk.docgen.table.EditableTable; -import gov.nasa.jpl.mbee.mdk.docgen.table.PropertyEnum; -import gov.nasa.jpl.mbee.mdk.docgen.view.*; -import gov.nasa.jpl.mbee.mdk.docgen.view.util.DocGenViewSwitch; -import gov.nasa.jpl.mbee.mdk.util.Utils; +import org.openmbee.mdk.api.incubating.convert.Converters; +import org.openmbee.mdk.docgen.table.EditableTable; +import org.openmbee.mdk.docgen.table.PropertyEnum; +import org.openmbee.mdk.docgen.view.util.DocGenViewSwitch; +import org.openmbee.mdk.util.Utils; +import org.openmbee.mdk.docgen.docbook.*; +import org.openmbee.mdk.docgen.view.*; import java.util.ArrayList; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/ViewViewpointValidator.java b/src/main/java/org/openmbee/mdk/docgen/ViewViewpointValidator.java similarity index 95% rename from src/main/java/gov/nasa/jpl/mbee/mdk/docgen/ViewViewpointValidator.java rename to src/main/java/org/openmbee/mdk/docgen/ViewViewpointValidator.java index 2b9826087..34801718f 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/ViewViewpointValidator.java +++ b/src/main/java/org/openmbee/mdk/docgen/ViewViewpointValidator.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.docgen; +package org.openmbee.mdk.docgen; import com.nomagic.magicdraw.core.Project; import com.nomagic.magicdraw.sysml.util.SysMLProfile; @@ -17,24 +17,24 @@ import com.nomagic.uml2.ext.magicdraw.commonbehaviors.mdbasicbehaviors.Behavior; import com.nomagic.uml2.ext.magicdraw.commonbehaviors.mdbasicbehaviors.BehavioredClassifier; import com.nomagic.uml2.ext.magicdraw.mdprofiles.Stereotype; -import gov.nasa.jpl.mbee.mdk.SysMLExtensions; -import gov.nasa.jpl.mbee.mdk.api.incubating.convert.Converters; -import gov.nasa.jpl.mbee.mdk.constraint.BasicConstraint; -import gov.nasa.jpl.mbee.mdk.constraint.Constraint; -import gov.nasa.jpl.mbee.mdk.docgen.actions.SetViewpointMethodAction; -import gov.nasa.jpl.mbee.mdk.docgen.validation.ConstraintValidationRule; -import gov.nasa.jpl.mbee.mdk.generator.DocumentGenerator; -import gov.nasa.jpl.mbee.mdk.generator.GenerationContext; -import gov.nasa.jpl.mbee.mdk.ocl.OclEvaluator; -import gov.nasa.jpl.mbee.mdk.util.*; -import gov.nasa.jpl.mbee.mdk.validation.ValidationRule; -import gov.nasa.jpl.mbee.mdk.validation.ValidationRuleViolation; -import gov.nasa.jpl.mbee.mdk.validation.ValidationSuite; -import gov.nasa.jpl.mbee.mdk.validation.ViolationSeverity; +import org.openmbee.mdk.SysMLExtensions; +import org.openmbee.mdk.api.incubating.convert.Converters; +import org.openmbee.mdk.constraint.BasicConstraint; +import org.openmbee.mdk.constraint.Constraint; +import org.openmbee.mdk.docgen.actions.SetViewpointMethodAction; +import org.openmbee.mdk.docgen.validation.ConstraintValidationRule; +import org.openmbee.mdk.generator.DocumentGenerator; +import org.openmbee.mdk.generator.GenerationContext; +import org.openmbee.mdk.ocl.OclEvaluator; +import org.openmbee.mdk.validation.ValidationRule; +import org.openmbee.mdk.validation.ValidationRuleViolation; +import org.openmbee.mdk.validation.ValidationSuite; +import org.openmbee.mdk.validation.ViolationSeverity; import org.eclipse.ocl.ParserException; import org.jgrapht.DirectedGraph; import org.jgrapht.EdgeFactory; import org.jgrapht.graph.DefaultDirectedGraph; +import org.openmbee.mdk.util.*; import java.util.*; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/actions/PreviewDocumentAction.java b/src/main/java/org/openmbee/mdk/docgen/actions/PreviewDocumentAction.java similarity index 81% rename from src/main/java/gov/nasa/jpl/mbee/mdk/docgen/actions/PreviewDocumentAction.java rename to src/main/java/org/openmbee/mdk/docgen/actions/PreviewDocumentAction.java index ef2855119..83f364833 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/actions/PreviewDocumentAction.java +++ b/src/main/java/org/openmbee/mdk/docgen/actions/PreviewDocumentAction.java @@ -1,16 +1,16 @@ -package gov.nasa.jpl.mbee.mdk.docgen.actions; +package org.openmbee.mdk.docgen.actions; import com.nomagic.magicdraw.actions.MDAction; import com.nomagic.magicdraw.core.Application; import com.nomagic.magicdraw.core.Project; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; -import gov.nasa.jpl.mbee.mdk.api.incubating.convert.Converters; -import gov.nasa.jpl.mbee.mdk.generator.DocumentGenerator; -import gov.nasa.jpl.mbee.mdk.docgen.ViewViewpointValidator; -import gov.nasa.jpl.mbee.mdk.generator.DocumentViewer; -import gov.nasa.jpl.mbee.mdk.generator.PostProcessor; -import gov.nasa.jpl.mbee.mdk.model.Document; -import gov.nasa.jpl.mbee.mdk.util.Utils; +import org.openmbee.mdk.api.incubating.convert.Converters; +import org.openmbee.mdk.generator.DocumentGenerator; +import org.openmbee.mdk.docgen.ViewViewpointValidator; +import org.openmbee.mdk.generator.DocumentViewer; +import org.openmbee.mdk.generator.PostProcessor; +import org.openmbee.mdk.model.Document; +import org.openmbee.mdk.util.Utils; import java.awt.event.ActionEvent; import java.util.Collections; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/actions/SetViewpointMethodAction.java b/src/main/java/org/openmbee/mdk/docgen/actions/SetViewpointMethodAction.java similarity index 91% rename from src/main/java/gov/nasa/jpl/mbee/mdk/docgen/actions/SetViewpointMethodAction.java rename to src/main/java/org/openmbee/mdk/docgen/actions/SetViewpointMethodAction.java index 489861f8a..67f3403c8 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/actions/SetViewpointMethodAction.java +++ b/src/main/java/org/openmbee/mdk/docgen/actions/SetViewpointMethodAction.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.docgen.actions; +package org.openmbee.mdk.docgen.actions; import com.nomagic.magicdraw.annotation.Annotation; import com.nomagic.magicdraw.annotation.AnnotationAction; @@ -8,10 +8,10 @@ import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Class; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Operation; import com.nomagic.uml2.ext.magicdraw.commonbehaviors.mdbasicbehaviors.Behavior; -import gov.nasa.jpl.mbee.mdk.actions.ViewpointAdditionalDrawAction; -import gov.nasa.jpl.mbee.mdk.api.incubating.convert.Converters; -import gov.nasa.jpl.mbee.mdk.validation.IRuleViolationAction; -import gov.nasa.jpl.mbee.mdk.validation.RuleViolationAction; +import org.openmbee.mdk.actions.ViewpointAdditionalDrawAction; +import org.openmbee.mdk.api.incubating.convert.Converters; +import org.openmbee.mdk.validation.IRuleViolationAction; +import org.openmbee.mdk.validation.RuleViolationAction; import javax.annotation.CheckForNull; import java.awt.event.ActionEvent; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/actions/ValidateAllViewsAction.java b/src/main/java/org/openmbee/mdk/docgen/actions/ValidateAllViewsAction.java similarity index 92% rename from src/main/java/gov/nasa/jpl/mbee/mdk/docgen/actions/ValidateAllViewsAction.java rename to src/main/java/org/openmbee/mdk/docgen/actions/ValidateAllViewsAction.java index 5f05aac56..b27c29b7a 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/actions/ValidateAllViewsAction.java +++ b/src/main/java/org/openmbee/mdk/docgen/actions/ValidateAllViewsAction.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.docgen.actions; +package org.openmbee.mdk.docgen.actions; import com.nomagic.magicdraw.actions.MDAction; import com.nomagic.magicdraw.core.Application; @@ -8,9 +8,9 @@ import com.nomagic.uml2.ext.jmi.helpers.StereotypesHelper; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; import com.nomagic.uml2.ext.magicdraw.mdprofiles.Stereotype; -import gov.nasa.jpl.mbee.mdk.docgen.ViewViewpointValidator; -import gov.nasa.jpl.mbee.mdk.mms.actions.ValidateBranchesAction; -import gov.nasa.jpl.mbee.mdk.util.Utils; +import org.openmbee.mdk.docgen.ViewViewpointValidator; +import org.openmbee.mdk.mms.actions.ValidateBranchesAction; +import org.openmbee.mdk.util.Utils; import javax.annotation.CheckForNull; import java.awt.event.ActionEvent; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/actions/ValidateViewAction.java b/src/main/java/org/openmbee/mdk/docgen/actions/ValidateViewAction.java similarity index 92% rename from src/main/java/gov/nasa/jpl/mbee/mdk/docgen/actions/ValidateViewAction.java rename to src/main/java/org/openmbee/mdk/docgen/actions/ValidateViewAction.java index 11ed2dcad..e7896b41c 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/actions/ValidateViewAction.java +++ b/src/main/java/org/openmbee/mdk/docgen/actions/ValidateViewAction.java @@ -1,11 +1,11 @@ -package gov.nasa.jpl.mbee.mdk.docgen.actions; +package org.openmbee.mdk.docgen.actions; import com.nomagic.magicdraw.actions.MDAction; import com.nomagic.magicdraw.core.Application; import com.nomagic.magicdraw.core.Project; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Class; -import gov.nasa.jpl.mbee.mdk.docgen.ViewViewpointValidator; -import gov.nasa.jpl.mbee.mdk.util.Utils; +import org.openmbee.mdk.docgen.ViewViewpointValidator; +import org.openmbee.mdk.util.Utils; import java.awt.event.ActionEvent; import java.util.Collections; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/DBAbstractVisitor.java b/src/main/java/org/openmbee/mdk/docgen/docbook/DBAbstractVisitor.java similarity index 96% rename from src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/DBAbstractVisitor.java rename to src/main/java/org/openmbee/mdk/docgen/docbook/DBAbstractVisitor.java index dd2915ead..88a78af2a 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/DBAbstractVisitor.java +++ b/src/main/java/org/openmbee/mdk/docgen/docbook/DBAbstractVisitor.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.docgen.docbook; +package org.openmbee.mdk.docgen.docbook; public abstract class DBAbstractVisitor implements IDBVisitor { diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/DBBook.java b/src/main/java/org/openmbee/mdk/docgen/docbook/DBBook.java similarity index 91% rename from src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/DBBook.java rename to src/main/java/org/openmbee/mdk/docgen/docbook/DBBook.java index de385c9b3..e41317dd9 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/DBBook.java +++ b/src/main/java/org/openmbee/mdk/docgen/docbook/DBBook.java @@ -1,6 +1,6 @@ -package gov.nasa.jpl.mbee.mdk.docgen.docbook; +package org.openmbee.mdk.docgen.docbook; -import gov.nasa.jpl.mbee.mdk.model.docmeta.DocumentMeta; +import org.openmbee.mdk.model.docmeta.DocumentMeta; /** * If you find an occasion where you want to use this, let me know. diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/DBColSpec.java b/src/main/java/org/openmbee/mdk/docgen/docbook/DBColSpec.java similarity index 96% rename from src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/DBColSpec.java rename to src/main/java/org/openmbee/mdk/docgen/docbook/DBColSpec.java index 3ed50dd00..80f59773e 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/DBColSpec.java +++ b/src/main/java/org/openmbee/mdk/docgen/docbook/DBColSpec.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.docgen.docbook; +package org.openmbee.mdk.docgen.docbook; /** * docbook column spec in a table
diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/DBHasContent.java b/src/main/java/org/openmbee/mdk/docgen/docbook/DBHasContent.java similarity index 94% rename from src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/DBHasContent.java rename to src/main/java/org/openmbee/mdk/docgen/docbook/DBHasContent.java index 3f68a5f09..713d7c88e 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/DBHasContent.java +++ b/src/main/java/org/openmbee/mdk/docgen/docbook/DBHasContent.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.docgen.docbook; +package org.openmbee.mdk.docgen.docbook; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/DBImage.java b/src/main/java/org/openmbee/mdk/docgen/docbook/DBImage.java similarity index 97% rename from src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/DBImage.java rename to src/main/java/org/openmbee/mdk/docgen/docbook/DBImage.java index 839dcafdc..e1d464108 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/DBImage.java +++ b/src/main/java/org/openmbee/mdk/docgen/docbook/DBImage.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.docgen.docbook; +package org.openmbee.mdk.docgen.docbook; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Diagram; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/DBList.java b/src/main/java/org/openmbee/mdk/docgen/docbook/DBList.java similarity index 91% rename from src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/DBList.java rename to src/main/java/org/openmbee/mdk/docgen/docbook/DBList.java index f4e0524ac..d8dcc55fa 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/DBList.java +++ b/src/main/java/org/openmbee/mdk/docgen/docbook/DBList.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.docgen.docbook; +package org.openmbee.mdk.docgen.docbook; /** * A list, can be unordered or ordered
diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/DBListItem.java b/src/main/java/org/openmbee/mdk/docgen/docbook/DBListItem.java similarity index 84% rename from src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/DBListItem.java rename to src/main/java/org/openmbee/mdk/docgen/docbook/DBListItem.java index 7949c88b3..38b129d4e 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/DBListItem.java +++ b/src/main/java/org/openmbee/mdk/docgen/docbook/DBListItem.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.docgen.docbook; +package org.openmbee.mdk.docgen.docbook; /** * Use this if your list item itself contains multiple stuff diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/DBParagraph.java b/src/main/java/org/openmbee/mdk/docgen/docbook/DBParagraph.java similarity index 91% rename from src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/DBParagraph.java rename to src/main/java/org/openmbee/mdk/docgen/docbook/DBParagraph.java index d076d2c8c..057c397bf 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/DBParagraph.java +++ b/src/main/java/org/openmbee/mdk/docgen/docbook/DBParagraph.java @@ -1,7 +1,7 @@ -package gov.nasa.jpl.mbee.mdk.docgen.docbook; +package org.openmbee.mdk.docgen.docbook; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; -import gov.nasa.jpl.mbee.mdk.docgen.docbook.stereotypes.EditableChoosable; +import org.openmbee.mdk.docgen.docbook.stereotypes.EditableChoosable; /** * A paragraph. Unlike DBText, this WILL do processing on the given text to diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/DBPlot.java b/src/main/java/org/openmbee/mdk/docgen/docbook/DBPlot.java similarity index 94% rename from src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/DBPlot.java rename to src/main/java/org/openmbee/mdk/docgen/docbook/DBPlot.java index d39f7837d..7729a5db5 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/DBPlot.java +++ b/src/main/java/org/openmbee/mdk/docgen/docbook/DBPlot.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.docgen.docbook; +package org.openmbee.mdk.docgen.docbook; /** * Created by mw107 on 7/7/2017. diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/DBSection.java b/src/main/java/org/openmbee/mdk/docgen/docbook/DBSection.java similarity index 97% rename from src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/DBSection.java rename to src/main/java/org/openmbee/mdk/docgen/docbook/DBSection.java index bad2d2c2c..57179c6c3 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/DBSection.java +++ b/src/main/java/org/openmbee/mdk/docgen/docbook/DBSection.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.docgen.docbook; +package org.openmbee.mdk.docgen.docbook; /** * A Section or Appendix. If you want to make a new section, instance this and diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/DBSerializeVisitor.java b/src/main/java/org/openmbee/mdk/docgen/docbook/DBSerializeVisitor.java similarity index 98% rename from src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/DBSerializeVisitor.java rename to src/main/java/org/openmbee/mdk/docgen/docbook/DBSerializeVisitor.java index 66b032d0a..438443097 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/DBSerializeVisitor.java +++ b/src/main/java/org/openmbee/mdk/docgen/docbook/DBSerializeVisitor.java @@ -1,10 +1,10 @@ -package gov.nasa.jpl.mbee.mdk.docgen.docbook; +package org.openmbee.mdk.docgen.docbook; import com.nomagic.task.ProgressStatus; -import gov.nasa.jpl.mbee.mdk.docgen.DocGenUtils; -import gov.nasa.jpl.mbee.mdk.model.docmeta.DocumentMeta; -import gov.nasa.jpl.mbee.mdk.model.docmeta.Person; -import gov.nasa.jpl.mbee.mdk.model.docmeta.Revision; +import org.openmbee.mdk.docgen.DocGenUtils; +import org.openmbee.mdk.model.docmeta.DocumentMeta; +import org.openmbee.mdk.model.docmeta.Person; +import org.openmbee.mdk.model.docmeta.Revision; import java.io.File; import java.io.IOException; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/DBSimpleList.java b/src/main/java/org/openmbee/mdk/docgen/docbook/DBSimpleList.java similarity index 95% rename from src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/DBSimpleList.java rename to src/main/java/org/openmbee/mdk/docgen/docbook/DBSimpleList.java index 569fe4295..1c18aa5c1 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/DBSimpleList.java +++ b/src/main/java/org/openmbee/mdk/docgen/docbook/DBSimpleList.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.docgen.docbook; +package org.openmbee.mdk.docgen.docbook; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/DBTable.java b/src/main/java/org/openmbee/mdk/docgen/docbook/DBTable.java similarity index 99% rename from src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/DBTable.java rename to src/main/java/org/openmbee/mdk/docgen/docbook/DBTable.java index 7324ee489..f8d188062 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/DBTable.java +++ b/src/main/java/org/openmbee/mdk/docgen/docbook/DBTable.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.docgen.docbook; +package org.openmbee.mdk.docgen.docbook; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/DBTableEntry.java b/src/main/java/org/openmbee/mdk/docgen/docbook/DBTableEntry.java similarity index 96% rename from src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/DBTableEntry.java rename to src/main/java/org/openmbee/mdk/docgen/docbook/DBTableEntry.java index 24ba705b1..1df641279 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/DBTableEntry.java +++ b/src/main/java/org/openmbee/mdk/docgen/docbook/DBTableEntry.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.docgen.docbook; +package org.openmbee.mdk.docgen.docbook; /** * Use this if a cell in your table needs to have multiple things in it or it diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/DBText.java b/src/main/java/org/openmbee/mdk/docgen/docbook/DBText.java similarity index 96% rename from src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/DBText.java rename to src/main/java/org/openmbee/mdk/docgen/docbook/DBText.java index 30c3d5445..b0f242a33 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/DBText.java +++ b/src/main/java/org/openmbee/mdk/docgen/docbook/DBText.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.docgen.docbook; +package org.openmbee.mdk.docgen.docbook; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/DBTomSawyerDiagram.java b/src/main/java/org/openmbee/mdk/docgen/docbook/DBTomSawyerDiagram.java similarity index 90% rename from src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/DBTomSawyerDiagram.java rename to src/main/java/org/openmbee/mdk/docgen/docbook/DBTomSawyerDiagram.java index 2e7f20a4b..7811d9c49 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/DBTomSawyerDiagram.java +++ b/src/main/java/org/openmbee/mdk/docgen/docbook/DBTomSawyerDiagram.java @@ -1,7 +1,7 @@ -package gov.nasa.jpl.mbee.mdk.docgen.docbook; +package org.openmbee.mdk.docgen.docbook; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; -import gov.nasa.jpl.mbee.mdk.model.TomSawyerDiagram; +import org.openmbee.mdk.model.TomSawyerDiagram; import java.util.Set; @@ -48,4 +48,4 @@ public void setType(TomSawyerDiagram.DiagramType type) { public TomSawyerDiagram.DiagramType getType() { return type; } -} \ No newline at end of file +} diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/DocumentElement.java b/src/main/java/org/openmbee/mdk/docgen/docbook/DocumentElement.java similarity index 95% rename from src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/DocumentElement.java rename to src/main/java/org/openmbee/mdk/docgen/docbook/DocumentElement.java index 492135679..a61e2742b 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/DocumentElement.java +++ b/src/main/java/org/openmbee/mdk/docgen/docbook/DocumentElement.java @@ -1,7 +1,7 @@ -package gov.nasa.jpl.mbee.mdk.docgen.docbook; +package org.openmbee.mdk.docgen.docbook; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; -import gov.nasa.jpl.mbee.mdk.model.DocGenElement; +import org.openmbee.mdk.model.DocGenElement; /** * @author dlam diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/From.java b/src/main/java/org/openmbee/mdk/docgen/docbook/From.java similarity index 54% rename from src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/From.java rename to src/main/java/org/openmbee/mdk/docgen/docbook/From.java index becdcc929..163516098 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/From.java +++ b/src/main/java/org/openmbee/mdk/docgen/docbook/From.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.docgen.docbook; +package org.openmbee.mdk.docgen.docbook; public enum From { NAME, DOCUMENTATION, DVALUE diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/IDBVisitor.java b/src/main/java/org/openmbee/mdk/docgen/docbook/IDBVisitor.java similarity index 91% rename from src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/IDBVisitor.java rename to src/main/java/org/openmbee/mdk/docgen/docbook/IDBVisitor.java index cc4fa7dee..21ff1c558 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/IDBVisitor.java +++ b/src/main/java/org/openmbee/mdk/docgen/docbook/IDBVisitor.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.docgen.docbook; +package org.openmbee.mdk.docgen.docbook; public interface IDBVisitor { diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/IDocumentElement.java b/src/main/java/org/openmbee/mdk/docgen/docbook/IDocumentElement.java similarity index 84% rename from src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/IDocumentElement.java rename to src/main/java/org/openmbee/mdk/docgen/docbook/IDocumentElement.java index 9ae013a23..d7302f364 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/IDocumentElement.java +++ b/src/main/java/org/openmbee/mdk/docgen/docbook/IDocumentElement.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.docgen.docbook; +package org.openmbee.mdk.docgen.docbook; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/stereotypes/EditableChoosable.java b/src/main/java/org/openmbee/mdk/docgen/docbook/stereotypes/EditableChoosable.java similarity index 71% rename from src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/stereotypes/EditableChoosable.java rename to src/main/java/org/openmbee/mdk/docgen/docbook/stereotypes/EditableChoosable.java index 2f7992168..5f0eb6431 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/docbook/stereotypes/EditableChoosable.java +++ b/src/main/java/org/openmbee/mdk/docgen/docbook/stereotypes/EditableChoosable.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.docgen.docbook.stereotypes; +package org.openmbee.mdk.docgen.docbook.stereotypes; /** * Created by igomes on 8/25/16. diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/table/EditableTable.java b/src/main/java/org/openmbee/mdk/docgen/table/EditableTable.java similarity index 99% rename from src/main/java/gov/nasa/jpl/mbee/mdk/docgen/table/EditableTable.java rename to src/main/java/org/openmbee/mdk/docgen/table/EditableTable.java index 27979f5c1..b1f3c7d9e 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/table/EditableTable.java +++ b/src/main/java/org/openmbee/mdk/docgen/table/EditableTable.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.docgen.table; +package org.openmbee.mdk.docgen.table; import au.com.bytecode.opencsv.CSVReader; import au.com.bytecode.opencsv.CSVWriter; @@ -12,8 +12,8 @@ import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.NamedElement; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Property; -import gov.nasa.jpl.mbee.mdk.api.incubating.convert.Converters; -import gov.nasa.jpl.mbee.mdk.util.Utils; +import org.openmbee.mdk.api.incubating.convert.Converters; +import org.openmbee.mdk.util.Utils; import javax.swing.*; import javax.swing.table.DefaultTableCellRenderer; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/table/EditableTableModel.java b/src/main/java/org/openmbee/mdk/docgen/table/EditableTableModel.java similarity index 98% rename from src/main/java/gov/nasa/jpl/mbee/mdk/docgen/table/EditableTableModel.java rename to src/main/java/org/openmbee/mdk/docgen/table/EditableTableModel.java index 396a27f98..881e347b2 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/table/EditableTableModel.java +++ b/src/main/java/org/openmbee/mdk/docgen/table/EditableTableModel.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.docgen.table; +package org.openmbee.mdk.docgen.table; import com.nomagic.magicdraw.core.Application; import com.nomagic.magicdraw.core.GUILog; @@ -10,7 +10,7 @@ import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.NamedElement; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Property; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Slot; -import gov.nasa.jpl.mbee.mdk.util.Utils; +import org.openmbee.mdk.util.Utils; import javax.swing.*; import javax.swing.table.AbstractTableModel; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/table/PropertiesTable.java b/src/main/java/org/openmbee/mdk/docgen/table/PropertiesTable.java similarity index 99% rename from src/main/java/gov/nasa/jpl/mbee/mdk/docgen/table/PropertiesTable.java rename to src/main/java/org/openmbee/mdk/docgen/table/PropertiesTable.java index 2e07f3db1..5ff7af895 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/table/PropertiesTable.java +++ b/src/main/java/org/openmbee/mdk/docgen/table/PropertiesTable.java @@ -1,11 +1,11 @@ -package gov.nasa.jpl.mbee.mdk.docgen.table; +package org.openmbee.mdk.docgen.table; import com.nomagic.magicdraw.uml2.util.UML2ModelUtil; import com.nomagic.uml2.ext.jmi.helpers.StereotypesHelper; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.*; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Class; import com.nomagic.uml2.ext.magicdraw.mdprofiles.Stereotype; -import gov.nasa.jpl.mbee.mdk.util.Utils; +import org.openmbee.mdk.util.Utils; import javax.swing.tree.DefaultMutableTreeNode; import java.util.*; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/table/PropertyEnum.java b/src/main/java/org/openmbee/mdk/docgen/table/PropertyEnum.java similarity index 82% rename from src/main/java/gov/nasa/jpl/mbee/mdk/docgen/table/PropertyEnum.java rename to src/main/java/org/openmbee/mdk/docgen/table/PropertyEnum.java index 5578a4268..80db6c3be 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/table/PropertyEnum.java +++ b/src/main/java/org/openmbee/mdk/docgen/table/PropertyEnum.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.docgen.table; +package org.openmbee.mdk.docgen.table; /** * What to display/change for an element in the editable table. Right now only diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/validation/ConstraintValidationRule.java b/src/main/java/org/openmbee/mdk/docgen/validation/ConstraintValidationRule.java similarity index 80% rename from src/main/java/gov/nasa/jpl/mbee/mdk/docgen/validation/ConstraintValidationRule.java rename to src/main/java/org/openmbee/mdk/docgen/validation/ConstraintValidationRule.java index 2964ca84d..696e09ad0 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/validation/ConstraintValidationRule.java +++ b/src/main/java/org/openmbee/mdk/docgen/validation/ConstraintValidationRule.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.docgen.validation; +package org.openmbee.mdk.docgen.validation; import com.nomagic.magicdraw.annotation.Annotation; import com.nomagic.magicdraw.core.Project; @@ -9,18 +9,17 @@ import com.nomagic.uml2.ext.magicdraw.classes.mdinterfaces.Interface; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.*; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Package; -import gov.nasa.jpl.mbee.mdk.SysMLExtensions; -import gov.nasa.jpl.mbee.mdk.constraint.BasicConstraint; -import gov.nasa.jpl.mbee.mdk.constraint.BasicConstraint.Type; -import gov.nasa.jpl.mbee.mdk.docgen.ViewViewpointValidator; -import gov.nasa.jpl.mbee.mdk.ocl.OclEvaluator; -import gov.nasa.jpl.mbee.mdk.util.CompareUtils; -import gov.nasa.jpl.mbee.mdk.util.Debug; -import gov.nasa.jpl.mbee.mdk.util.Utils; -import gov.nasa.jpl.mbee.mdk.util.Utils2; -import gov.nasa.jpl.mbee.mdk.validation.ValidationRule; -import gov.nasa.jpl.mbee.mdk.validation.ValidationRuleViolation; -import gov.nasa.jpl.mbee.mdk.validation.ViolationSeverity; +import org.openmbee.mdk.SysMLExtensions; +import org.openmbee.mdk.constraint.BasicConstraint; +import org.openmbee.mdk.docgen.ViewViewpointValidator; +import org.openmbee.mdk.ocl.OclEvaluator; +import org.openmbee.mdk.util.CompareUtils; +import org.openmbee.mdk.util.Debug; +import org.openmbee.mdk.util.Utils; +import org.openmbee.mdk.util.Utils2; +import org.openmbee.mdk.validation.ValidationRule; +import org.openmbee.mdk.validation.ValidationRuleViolation; +import org.openmbee.mdk.validation.ViolationSeverity; import java.lang.Class; import java.util.*; @@ -38,10 +37,10 @@ public class ConstraintValidationRule extends ValidationRule implements ElementV protected Constraint constraint = null; protected Set elementsWithConstraints = new LinkedHashSet(); - protected Map> elementToConstraintMap = new TreeMap>( + protected Map> elementToConstraintMap = new TreeMap>( CompareUtils.GenericComparator .instance()); - protected Map> constraintToElementMap = new TreeMap>( + protected Map> constraintToElementMap = new TreeMap>( CompareUtils.GenericComparator .instance()); protected Map> constraintElementToViolationMap = new TreeMap>( @@ -49,7 +48,7 @@ public class ConstraintValidationRule extends ValidationRule implements ElementV .instance()); protected Set annotations = null; - public BasicConstraint.Type constraintType = Type.ANY; + public BasicConstraint.Type constraintType = BasicConstraint.Type.ANY; public boolean loggingResults = true; public ConstraintValidationRule() { @@ -136,13 +135,13 @@ protected void initConstraintMaps(Project paramProject, Collection constraints = BasicConstraint.getConstraints(elemt, + List constraints = BasicConstraint.getConstraints(elemt, constraintType); if (!Utils2.isNullOrEmpty(constraints)) { elementsWithConstraints.add(elemt); } Utils2.addAllToSet(elementToConstraintMap, elemt, constraints); - for (gov.nasa.jpl.mbee.mdk.constraint.Constraint constr : constraints) { + for (org.openmbee.mdk.constraint.Constraint constr : constraints) { Utils2.addToSet(constraintToElementMap, constr, elemt); } @@ -162,7 +161,7 @@ protected void initConstraintMaps(Project paramProject, Collection constrained = BasicConstraint .getConstrainedObjectsFromConstraintElement(elem); - gov.nasa.jpl.mbee.mdk.constraint.Constraint constr = new BasicConstraint(elem, constrained); + org.openmbee.mdk.constraint.Constraint constr = new BasicConstraint(elem, constrained); for (Object o : constrained) { if (o instanceof BaseElement) { BaseElement baseElem = (BaseElement) o; @@ -177,9 +176,9 @@ protected void initConstraintMaps(Project paramProject, Collection getAffectedConstraints( + public Collection getAffectedConstraints( Collection elements) { - Set constraints = new TreeSet( + Set constraints = new TreeSet( CompareUtils.GenericComparator.instance()); for (BaseElement elem : elements) { constraints.addAll(elementToConstraintMap.get(elem)); @@ -187,24 +186,24 @@ public Collection getAffectedConstr return constraints; } - public static Element getConstraintObject(gov.nasa.jpl.mbee.mdk.constraint.Constraint constraint) { + public static Element getConstraintObject(org.openmbee.mdk.constraint.Constraint constraint) { if (constraint == null || Utils2.isNullOrEmpty(constraint.getConstrainingElements())) { return null; } return constraint.getConstrainingElements().iterator().next(); } - public static boolean isUml(gov.nasa.jpl.mbee.mdk.constraint.Constraint constraint) { + public static boolean isUml(org.openmbee.mdk.constraint.Constraint constraint) { Element constrObj = getConstraintObject(constraint); return (constrObj != null && constrObj instanceof Constraint); } - public static boolean isDocGenConstraint(gov.nasa.jpl.mbee.mdk.constraint.Constraint constraint) { + public static boolean isDocGenConstraint(org.openmbee.mdk.constraint.Constraint constraint) { Element constrObj = getConstraintObject(constraint); return (constrObj != null && SysMLExtensions.getInstance(constrObj).constraint().is(constrObj)); } - private static boolean isLanguageOcl(gov.nasa.jpl.mbee.mdk.constraint.Constraint constraint) { + private static boolean isLanguageOcl(org.openmbee.mdk.constraint.Constraint constraint) { if (isDocGenConstraint(constraint)) { return true; } @@ -234,9 +233,9 @@ public Set run(Project paramProject, Constraint paramConstraint, Col initConstraintMaps(paramProject, paramCollection); @SuppressWarnings("unchecked") - Collection constraints = (Collection) (Utils2.isNullOrEmpty(elementsWithConstraints) ? (constraintToElementMap == null ? Utils2.newList() : constraintToElementMap.keySet()) : getAffectedConstraints(elementsWithConstraints)); + Collection constraints = (Collection) (Utils2.isNullOrEmpty(elementsWithConstraints) ? (constraintToElementMap == null ? Utils2.newList() : constraintToElementMap.keySet()) : getAffectedConstraints(elementsWithConstraints)); - for (gov.nasa.jpl.mbee.mdk.constraint.Constraint constraint : constraints) { + for (org.openmbee.mdk.constraint.Constraint constraint : constraints) { try { Boolean satisfied = ViewViewpointValidator.evaluateConstraint(constraint); if (loggingResults) { @@ -255,7 +254,7 @@ public Set run(Project paramProject, Constraint paramConstraint, Col return result; } - public static void logResults(Boolean satisfied, gov.nasa.jpl.mbee.mdk.constraint.Constraint constraint) { + public static void logResults(Boolean satisfied, org.openmbee.mdk.constraint.Constraint constraint) { if (satisfied == null) { String errorMsg = ""; OclEvaluator e = OclEvaluator.instance; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/validation/DocGenValidationFactory.java b/src/main/java/org/openmbee/mdk/docgen/validation/DocGenValidationFactory.java similarity index 92% rename from src/main/java/gov/nasa/jpl/mbee/mdk/docgen/validation/DocGenValidationFactory.java rename to src/main/java/org/openmbee/mdk/docgen/validation/DocGenValidationFactory.java index 20ac45719..e24d267be 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/validation/DocGenValidationFactory.java +++ b/src/main/java/org/openmbee/mdk/docgen/validation/DocGenValidationFactory.java @@ -1,6 +1,6 @@ -package gov.nasa.jpl.mbee.mdk.docgen.validation; +package org.openmbee.mdk.docgen.validation; -import gov.nasa.jpl.mbee.mdk.docgen.validation.impl.DocGenValidationFactoryImpl; +import org.openmbee.mdk.docgen.validation.impl.DocGenValidationFactoryImpl; import org.eclipse.emf.ecore.EFactory; /** diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/validation/DocGenValidationPackage.java b/src/main/java/org/openmbee/mdk/docgen/validation/DocGenValidationPackage.java similarity index 97% rename from src/main/java/gov/nasa/jpl/mbee/mdk/docgen/validation/DocGenValidationPackage.java rename to src/main/java/org/openmbee/mdk/docgen/validation/DocGenValidationPackage.java index 3ae26b8e1..2534ffb81 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/validation/DocGenValidationPackage.java +++ b/src/main/java/org/openmbee/mdk/docgen/validation/DocGenValidationPackage.java @@ -1,9 +1,9 @@ -package gov.nasa.jpl.mbee.mdk.docgen.validation; +package org.openmbee.mdk.docgen.validation; -import gov.nasa.jpl.mbee.mdk.docgen.validation.impl.DocGenValidationPackageImpl; -import gov.nasa.jpl.mbee.mdk.docgen.validation.impl.RuleImpl; -import gov.nasa.jpl.mbee.mdk.docgen.validation.impl.SuiteImpl; -import gov.nasa.jpl.mbee.mdk.docgen.validation.impl.ViolationImpl; +import org.openmbee.mdk.docgen.validation.impl.DocGenValidationPackageImpl; +import org.openmbee.mdk.docgen.validation.impl.RuleImpl; +import org.openmbee.mdk.docgen.validation.impl.SuiteImpl; +import org.openmbee.mdk.docgen.validation.impl.ViolationImpl; import org.eclipse.emf.ecore.*; /** @@ -41,7 +41,7 @@ public interface DocGenValidationPackage extends EPackage { * * @generated */ - String eNS_PREFIX = "gov.nasa.jpl.mbee.mdk.dgvalidation"; + String eNS_PREFIX = "org.openmbee.mdk.dgvalidation"; /** * The singleton instance of the package. An implementation of the model Factory. An implementation of the model Package. * * @generated - * @see gov.nasa.jpl.mbee.mdk.docgen.view.impl.ViewElementImpl + * @see ViewElementImpl * @see DocGenViewPackageImpl#getViewElement() */ int VIEW_ELEMENT = 9; @@ -108,11 +108,11 @@ public interface DocGenViewPackage extends EPackage { /** * The meta object id for the ' - * {@link gov.nasa.jpl.mbee.mdk.docgen.view.impl.ColSpecImpl + * {@link ColSpecImpl * Col Spec}' class. * * @generated - * @see gov.nasa.jpl.mbee.mdk.docgen.view.impl.ColSpecImpl + * @see ColSpecImpl * @see DocGenViewPackageImpl#getColSpec() */ int COL_SPEC = 0; @@ -191,12 +191,12 @@ public interface DocGenViewPackage extends EPackage { /** * The meta object id for the ' - * {@link gov.nasa.jpl.mbee.mdk.docgen.view.impl.HasContentImpl + * {@link HasContentImpl * Has Content}' class. * * @generated - * @see gov.nasa.jpl.mbee.mdk.docgen.view.impl.HasContentImpl + * @see HasContentImpl * @see DocGenViewPackageImpl#getHasContent() */ int HAS_CONTENT = 1; @@ -257,11 +257,11 @@ public interface DocGenViewPackage extends EPackage { /** * The meta object id for the ' - * {@link gov.nasa.jpl.mbee.mdk.docgen.view.impl.ImageImpl + * {@link ImageImpl * Image}' class. * * @generated - * @see gov.nasa.jpl.mbee.mdk.docgen.view.impl.ImageImpl + * @see ImageImpl * @see DocGenViewPackageImpl#getImage() */ int IMAGE = 2; @@ -349,11 +349,11 @@ public interface DocGenViewPackage extends EPackage { /** * The meta object id for the ' - * {@link gov.nasa.jpl.mbee.mdk.docgen.view.impl.ListImpl List}' + * {@link ListImpl List}' * class. * * @generated - * @see gov.nasa.jpl.mbee.mdk.docgen.view.impl.ListImpl + * @see ListImpl * @see DocGenViewPackageImpl#getList() */ int LIST = 3; @@ -423,11 +423,11 @@ public interface DocGenViewPackage extends EPackage { /** * The meta object id for the ' - * {@link gov.nasa.jpl.mbee.mdk.docgen.view.impl.ListItemImpl + * {@link ListItemImpl * List Item}' class. * * @generated - * @see gov.nasa.jpl.mbee.mdk.docgen.view.impl.ListItemImpl + * @see ListItemImpl * @see DocGenViewPackageImpl#getListItem() */ int LIST_ITEM = 4; @@ -488,11 +488,11 @@ public interface DocGenViewPackage extends EPackage { /** * The meta object id for the ' - * {@link gov.nasa.jpl.mbee.mdk.docgen.view.impl.ParagraphImpl + * {@link ParagraphImpl * Paragraph}' class. * * @generated - * @see gov.nasa.jpl.mbee.mdk.docgen.view.impl.ParagraphImpl + * @see ParagraphImpl * @see DocGenViewPackageImpl#getParagraph() */ int PARAGRAPH = 5; @@ -553,11 +553,11 @@ public interface DocGenViewPackage extends EPackage { /** * The meta object id for the ' - * {@link gov.nasa.jpl.mbee.mdk.docgen.view.impl.TableImpl + * {@link TableImpl * Table}' class. * * @generated - * @see gov.nasa.jpl.mbee.mdk.docgen.view.impl.TableImpl + * @see TableImpl * @see DocGenViewPackageImpl#getTable() */ int TABLE = 6; @@ -663,12 +663,12 @@ public interface DocGenViewPackage extends EPackage { /** * The meta object id for the ' - * {@link gov.nasa.jpl.mbee.mdk.docgen.view.impl.TableEntryImpl + * {@link TableEntryImpl * Table Entry}' class. * * @generated - * @see gov.nasa.jpl.mbee.mdk.docgen.view.impl.TableEntryImpl + * @see TableEntryImpl * @see DocGenViewPackageImpl#getTableEntry() */ int TABLE_ENTRY = 7; @@ -756,11 +756,11 @@ public interface DocGenViewPackage extends EPackage { /** * The meta object id for the ' - * {@link gov.nasa.jpl.mbee.mdk.docgen.view.impl.TextImpl Text}' + * {@link TextImpl Text}' * class. * * @generated - * @see gov.nasa.jpl.mbee.mdk.docgen.view.impl.TextImpl + * @see TextImpl * @see DocGenViewPackageImpl#getText() */ int TEXT = 8; @@ -821,11 +821,11 @@ public interface DocGenViewPackage extends EPackage { /** * The meta object id for the ' - * {@link gov.nasa.jpl.mbee.mdk.docgen.view.impl.TableRowImpl + * {@link TableRowImpl * Table Row}' class. * * @generated - * @see gov.nasa.jpl.mbee.mdk.docgen.view.impl.TableRowImpl + * @see TableRowImpl * @see DocGenViewPackageImpl#getTableRow() */ int TABLE_ROW = 10; @@ -886,12 +886,12 @@ public interface DocGenViewPackage extends EPackage { /** * The meta object id for the ' - * {@link gov.nasa.jpl.mbee.mdk.docgen.view.impl.MDEditableTableImpl + * {@link MDEditableTableImpl * MD Editable Table}' class. * * @generated - * @see gov.nasa.jpl.mbee.mdk.docgen.view.impl.MDEditableTableImpl + * @see MDEditableTableImpl * @see DocGenViewPackageImpl#getMDEditableTable() */ int MD_EDITABLE_TABLE = 11; @@ -1595,12 +1595,12 @@ public interface DocGenViewPackage extends EPackage { interface Literals { /** * The meta object literal for the ' - * {@link gov.nasa.jpl.mbee.mdk.docgen.view.impl.ColSpecImpl + * {@link ColSpecImpl * Col Spec}' class. * * @generated - * @see gov.nasa.jpl.mbee.mdk.docgen.view.impl.ColSpecImpl + * @see ColSpecImpl * @see DocGenViewPackageImpl#getColSpec() */ EClass COL_SPEC = eINSTANCE.getColSpec(); @@ -1631,12 +1631,12 @@ interface Literals { /** * The meta object literal for the ' - * {@link gov.nasa.jpl.mbee.mdk.docgen.view.impl.HasContentImpl + * {@link HasContentImpl * Has Content}' class. * * @generated - * @see gov.nasa.jpl.mbee.mdk.docgen.view.impl.HasContentImpl + * @see HasContentImpl * @see DocGenViewPackageImpl#getHasContent() */ EClass HAS_CONTENT = eINSTANCE.getHasContent(); @@ -1652,11 +1652,11 @@ interface Literals { /** * The meta object literal for the ' - * {@link gov.nasa.jpl.mbee.mdk.docgen.view.impl.ImageImpl + * {@link ImageImpl * Image}' class. * * @generated - * @see gov.nasa.jpl.mbee.mdk.docgen.view.impl.ImageImpl + * @see ImageImpl * @see DocGenViewPackageImpl#getImage() */ EClass IMAGE = eINSTANCE.getImage(); @@ -1695,11 +1695,11 @@ interface Literals { /** * The meta object literal for the ' - * {@link gov.nasa.jpl.mbee.mdk.docgen.view.impl.ListImpl + * {@link ListImpl * List}' class. * * @generated - * @see gov.nasa.jpl.mbee.mdk.docgen.view.impl.ListImpl + * @see ListImpl * @see DocGenViewPackageImpl#getList() */ EClass LIST = eINSTANCE.getList(); @@ -1714,24 +1714,24 @@ interface Literals { /** * The meta object literal for the ' - * {@link gov.nasa.jpl.mbee.mdk.docgen.view.impl.ListItemImpl + * {@link ListItemImpl * List Item}' class. * * @generated - * @see gov.nasa.jpl.mbee.mdk.docgen.view.impl.ListItemImpl + * @see ListItemImpl * @see DocGenViewPackageImpl#getListItem() */ EClass LIST_ITEM = eINSTANCE.getListItem(); /** * The meta object literal for the ' - * {@link gov.nasa.jpl.mbee.mdk.docgen.view.impl.ParagraphImpl + * {@link ParagraphImpl * Paragraph}' class. * * @generated - * @see gov.nasa.jpl.mbee.mdk.docgen.view.impl.ParagraphImpl + * @see ParagraphImpl * @see DocGenViewPackageImpl#getParagraph() */ EClass PARAGRAPH = eINSTANCE.getParagraph(); @@ -1746,11 +1746,11 @@ interface Literals { /** * The meta object literal for the ' - * {@link gov.nasa.jpl.mbee.mdk.docgen.view.impl.TableImpl + * {@link TableImpl * Table}' class. * * @generated - * @see gov.nasa.jpl.mbee.mdk.docgen.view.impl.TableImpl + * @see TableImpl * @see DocGenViewPackageImpl#getTable() */ EClass TABLE = eINSTANCE.getTable(); @@ -1806,12 +1806,12 @@ interface Literals { /** * The meta object literal for the ' - * {@link gov.nasa.jpl.mbee.mdk.docgen.view.impl.TableEntryImpl + * {@link TableEntryImpl * Table Entry}' class. * * @generated - * @see gov.nasa.jpl.mbee.mdk.docgen.view.impl.TableEntryImpl + * @see TableEntryImpl * @see DocGenViewPackageImpl#getTableEntry() */ EClass TABLE_ENTRY = eINSTANCE.getTableEntry(); @@ -1842,11 +1842,11 @@ interface Literals { /** * The meta object literal for the ' - * {@link gov.nasa.jpl.mbee.mdk.docgen.view.impl.TextImpl + * {@link TextImpl * Text}' class. * * @generated - * @see gov.nasa.jpl.mbee.mdk.docgen.view.impl.TextImpl + * @see TextImpl * @see DocGenViewPackageImpl#getText() */ EClass TEXT = eINSTANCE.getText(); @@ -1861,12 +1861,12 @@ interface Literals { /** * The meta object literal for the ' - * {@link gov.nasa.jpl.mbee.mdk.docgen.view.impl.ViewElementImpl + * {@link ViewElementImpl * View Element}' class. * * @generated - * @see gov.nasa.jpl.mbee.mdk.docgen.view.impl.ViewElementImpl + * @see ViewElementImpl * @see DocGenViewPackageImpl#getViewElement() */ EClass VIEW_ELEMENT = eINSTANCE.getViewElement(); @@ -1905,24 +1905,24 @@ interface Literals { /** * The meta object literal for the ' - * {@link gov.nasa.jpl.mbee.mdk.docgen.view.impl.TableRowImpl + * {@link TableRowImpl * Table Row}' class. * * @generated - * @see gov.nasa.jpl.mbee.mdk.docgen.view.impl.TableRowImpl + * @see TableRowImpl * @see DocGenViewPackageImpl#getTableRow() */ EClass TABLE_ROW = eINSTANCE.getTableRow(); /** * The meta object literal for the ' - * {@link gov.nasa.jpl.mbee.mdk.docgen.view.impl.MDEditableTableImpl + * {@link MDEditableTableImpl * MD Editable Table}' class. * * @generated - * @see gov.nasa.jpl.mbee.mdk.docgen.view.impl.MDEditableTableImpl + * @see MDEditableTableImpl * @see DocGenViewPackageImpl#getMDEditableTable() */ EClass MD_EDITABLE_TABLE = eINSTANCE.getMDEditableTable(); diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/view/FromProperty.java b/src/main/java/org/openmbee/mdk/docgen/view/FromProperty.java similarity index 99% rename from src/main/java/gov/nasa/jpl/mbee/mdk/docgen/view/FromProperty.java rename to src/main/java/org/openmbee/mdk/docgen/view/FromProperty.java index 9e28dea5e..b9fa2ef37 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/view/FromProperty.java +++ b/src/main/java/org/openmbee/mdk/docgen/view/FromProperty.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.docgen.view; +package org.openmbee.mdk.docgen.view; import org.eclipse.emf.common.util.Enumerator; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/view/HasContent.java b/src/main/java/org/openmbee/mdk/docgen/view/HasContent.java similarity index 85% rename from src/main/java/gov/nasa/jpl/mbee/mdk/docgen/view/HasContent.java rename to src/main/java/org/openmbee/mdk/docgen/view/HasContent.java index 17ce16154..c2fda8f64 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/view/HasContent.java +++ b/src/main/java/org/openmbee/mdk/docgen/view/HasContent.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.docgen.view; +package org.openmbee.mdk.docgen.view; import org.eclipse.emf.common.util.EList; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/view/Image.java b/src/main/java/org/openmbee/mdk/docgen/view/Image.java similarity index 97% rename from src/main/java/gov/nasa/jpl/mbee/mdk/docgen/view/Image.java rename to src/main/java/org/openmbee/mdk/docgen/view/Image.java index 6870dbea6..216190ba3 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/view/Image.java +++ b/src/main/java/org/openmbee/mdk/docgen/view/Image.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.docgen.view; +package org.openmbee.mdk.docgen.view; /** * @author dlam diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/view/List.java b/src/main/java/org/openmbee/mdk/docgen/view/List.java similarity index 91% rename from src/main/java/gov/nasa/jpl/mbee/mdk/docgen/view/List.java rename to src/main/java/org/openmbee/mdk/docgen/view/List.java index 02430f5c3..76f2feb83 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/view/List.java +++ b/src/main/java/org/openmbee/mdk/docgen/view/List.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.docgen.view; +package org.openmbee.mdk.docgen.view; /** * @author dlam diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/view/ListItem.java b/src/main/java/org/openmbee/mdk/docgen/view/ListItem.java similarity index 66% rename from src/main/java/gov/nasa/jpl/mbee/mdk/docgen/view/ListItem.java rename to src/main/java/org/openmbee/mdk/docgen/view/ListItem.java index a6829421c..a967d4273 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/view/ListItem.java +++ b/src/main/java/org/openmbee/mdk/docgen/view/ListItem.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.docgen.view; +package org.openmbee.mdk.docgen.view; /** * @author dlam diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/view/MDEditableTable.java b/src/main/java/org/openmbee/mdk/docgen/view/MDEditableTable.java similarity index 99% rename from src/main/java/gov/nasa/jpl/mbee/mdk/docgen/view/MDEditableTable.java rename to src/main/java/org/openmbee/mdk/docgen/view/MDEditableTable.java index f78fc7560..884f09863 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/view/MDEditableTable.java +++ b/src/main/java/org/openmbee/mdk/docgen/view/MDEditableTable.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.docgen.view; +package org.openmbee.mdk.docgen.view; import org.eclipse.emf.common.util.EList; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/view/Paragraph.java b/src/main/java/org/openmbee/mdk/docgen/view/Paragraph.java similarity index 91% rename from src/main/java/gov/nasa/jpl/mbee/mdk/docgen/view/Paragraph.java rename to src/main/java/org/openmbee/mdk/docgen/view/Paragraph.java index cf37cd038..bea18091b 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/view/Paragraph.java +++ b/src/main/java/org/openmbee/mdk/docgen/view/Paragraph.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.docgen.view; +package org.openmbee.mdk.docgen.view; /** * @author dlam diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/view/Table.java b/src/main/java/org/openmbee/mdk/docgen/view/Table.java similarity index 97% rename from src/main/java/gov/nasa/jpl/mbee/mdk/docgen/view/Table.java rename to src/main/java/org/openmbee/mdk/docgen/view/Table.java index ed2468cb6..a93731e07 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/view/Table.java +++ b/src/main/java/org/openmbee/mdk/docgen/view/Table.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.docgen.view; +package org.openmbee.mdk.docgen.view; import org.eclipse.emf.common.util.EList; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/view/TableEntry.java b/src/main/java/org/openmbee/mdk/docgen/view/TableEntry.java similarity index 96% rename from src/main/java/gov/nasa/jpl/mbee/mdk/docgen/view/TableEntry.java rename to src/main/java/org/openmbee/mdk/docgen/view/TableEntry.java index 1d8335950..59e6faa0a 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/view/TableEntry.java +++ b/src/main/java/org/openmbee/mdk/docgen/view/TableEntry.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.docgen.view; +package org.openmbee.mdk.docgen.view; /** * @author dlam diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/view/TableRow.java b/src/main/java/org/openmbee/mdk/docgen/view/TableRow.java similarity index 85% rename from src/main/java/gov/nasa/jpl/mbee/mdk/docgen/view/TableRow.java rename to src/main/java/org/openmbee/mdk/docgen/view/TableRow.java index 85dfaa1ce..669d4f465 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/view/TableRow.java +++ b/src/main/java/org/openmbee/mdk/docgen/view/TableRow.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.docgen.view; +package org.openmbee.mdk.docgen.view; /** * A representation of the model object ' diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/view/Text.java b/src/main/java/org/openmbee/mdk/docgen/view/Text.java similarity index 91% rename from src/main/java/gov/nasa/jpl/mbee/mdk/docgen/view/Text.java rename to src/main/java/org/openmbee/mdk/docgen/view/Text.java index 36744122e..914ea44be 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/view/Text.java +++ b/src/main/java/org/openmbee/mdk/docgen/view/Text.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.docgen.view; +package org.openmbee.mdk.docgen.view; /** * @author dlam diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/view/ViewElement.java b/src/main/java/org/openmbee/mdk/docgen/view/ViewElement.java similarity index 97% rename from src/main/java/gov/nasa/jpl/mbee/mdk/docgen/view/ViewElement.java rename to src/main/java/org/openmbee/mdk/docgen/view/ViewElement.java index d64b6c94c..2c95800c4 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/view/ViewElement.java +++ b/src/main/java/org/openmbee/mdk/docgen/view/ViewElement.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.docgen.view; +package org.openmbee.mdk.docgen.view; import org.eclipse.emf.ecore.EObject; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/view/impl/ColSpecImpl.java b/src/main/java/org/openmbee/mdk/docgen/view/impl/ColSpecImpl.java similarity index 94% rename from src/main/java/gov/nasa/jpl/mbee/mdk/docgen/view/impl/ColSpecImpl.java rename to src/main/java/org/openmbee/mdk/docgen/view/impl/ColSpecImpl.java index 3c5d114a6..f6cb2d20d 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/view/impl/ColSpecImpl.java +++ b/src/main/java/org/openmbee/mdk/docgen/view/impl/ColSpecImpl.java @@ -1,7 +1,7 @@ -package gov.nasa.jpl.mbee.mdk.docgen.view.impl; +package org.openmbee.mdk.docgen.view.impl; -import gov.nasa.jpl.mbee.mdk.docgen.view.ColSpec; -import gov.nasa.jpl.mbee.mdk.docgen.view.DocGenViewPackage; +import org.openmbee.mdk.docgen.view.ColSpec; +import org.openmbee.mdk.docgen.view.DocGenViewPackage; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.impl.ENotificationImpl; @@ -12,11 +12,11 @@ *

* The following features are implemented: *

    - *
  • {@link gov.nasa.jpl.mbee.mdk.docgen.view.impl.ColSpecImpl#getColname + *
  • {@link ColSpecImpl#getColname * Colname}
    • - *
  • {@link gov.nasa.jpl.mbee.mdk.docgen.view.impl.ColSpecImpl#getColwidth + *
  • {@link ColSpecImpl#getColwidth * Colwidth}
    • - *
  • {@link gov.nasa.jpl.mbee.mdk.docgen.view.impl.ColSpecImpl#getColnum + *
  • {@link ColSpecImpl#getColnum * Colnum}
    • *
*

diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/view/impl/DocGenViewFactoryImpl.java b/src/main/java/org/openmbee/mdk/docgen/view/impl/DocGenViewFactoryImpl.java similarity index 98% rename from src/main/java/gov/nasa/jpl/mbee/mdk/docgen/view/impl/DocGenViewFactoryImpl.java rename to src/main/java/org/openmbee/mdk/docgen/view/impl/DocGenViewFactoryImpl.java index 514ce3df8..64c489319 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/docgen/view/impl/DocGenViewFactoryImpl.java +++ b/src/main/java/org/openmbee/mdk/docgen/view/impl/DocGenViewFactoryImpl.java @@ -1,12 +1,12 @@ -package gov.nasa.jpl.mbee.mdk.docgen.view.impl; +package org.openmbee.mdk.docgen.view.impl; -import gov.nasa.jpl.mbee.mdk.docgen.view.*; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EDataType; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.impl.EFactoryImpl; import org.eclipse.emf.ecore.plugin.EcorePlugin; +import org.openmbee.mdk.docgen.view.*; /** * An implementation of the model Factory. An implementation of the model Package. The Switch for the model's inheritance diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/emf/BulkImportFunction.java b/src/main/java/org/openmbee/mdk/emf/BulkImportFunction.java similarity index 79% rename from src/main/java/gov/nasa/jpl/mbee/mdk/emf/BulkImportFunction.java rename to src/main/java/org/openmbee/mdk/emf/BulkImportFunction.java index 5a9f7a032..cf5da87ab 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/emf/BulkImportFunction.java +++ b/src/main/java/org/openmbee/mdk/emf/BulkImportFunction.java @@ -1,11 +1,11 @@ -package gov.nasa.jpl.mbee.mdk.emf; +package org.openmbee.mdk.emf; import com.fasterxml.jackson.databind.node.ObjectNode; import com.nomagic.magicdraw.core.Project; import com.nomagic.task.ProgressStatus; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; -import gov.nasa.jpl.mbee.mdk.util.Changelog; -import gov.nasa.jpl.mbee.mdk.util.Pair; +import org.openmbee.mdk.util.Changelog; +import org.openmbee.mdk.util.Pair; import java.util.Collection; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/emf/EMFBulkImporter.java b/src/main/java/org/openmbee/mdk/emf/EMFBulkImporter.java similarity index 96% rename from src/main/java/gov/nasa/jpl/mbee/mdk/emf/EMFBulkImporter.java rename to src/main/java/org/openmbee/mdk/emf/EMFBulkImporter.java index 9dfc1a8e9..ab9ca63c0 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/emf/EMFBulkImporter.java +++ b/src/main/java/org/openmbee/mdk/emf/EMFBulkImporter.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.emf; +package org.openmbee.mdk.emf; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; @@ -9,15 +9,15 @@ import com.nomagic.task.ProgressStatus; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; import com.nomagic.uml2.transaction.ModelValidationResult; -import gov.nasa.jpl.mbee.mdk.api.incubating.MDKConstants; -import gov.nasa.jpl.mbee.mdk.api.incubating.annotations.SessionManaged; -import gov.nasa.jpl.mbee.mdk.api.incubating.convert.Converters; -import gov.nasa.jpl.mbee.mdk.api.incubating.convert.JsonToElementFunction; -import gov.nasa.jpl.mbee.mdk.json.ImportException; -import gov.nasa.jpl.mbee.mdk.mms.json.JsonEquivalencePredicate; -import gov.nasa.jpl.mbee.mdk.util.Changelog; -import gov.nasa.jpl.mbee.mdk.util.MDUtils; -import gov.nasa.jpl.mbee.mdk.util.Pair; +import org.openmbee.mdk.api.incubating.MDKConstants; +import org.openmbee.mdk.api.incubating.annotations.SessionManaged; +import org.openmbee.mdk.api.incubating.convert.Converters; +import org.openmbee.mdk.api.incubating.convert.JsonToElementFunction; +import org.openmbee.mdk.json.ImportException; +import org.openmbee.mdk.mms.json.JsonEquivalencePredicate; +import org.openmbee.mdk.util.Changelog; +import org.openmbee.mdk.util.MDUtils; +import org.openmbee.mdk.util.Pair; import org.eclipse.emf.common.util.TreeIterator; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.util.EcoreUtil; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/emf/EMFExporter.java b/src/main/java/org/openmbee/mdk/emf/EMFExporter.java similarity index 98% rename from src/main/java/gov/nasa/jpl/mbee/mdk/emf/EMFExporter.java rename to src/main/java/org/openmbee/mdk/emf/EMFExporter.java index 52b2abe42..46002ce87 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/emf/EMFExporter.java +++ b/src/main/java/org/openmbee/mdk/emf/EMFExporter.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.emf; +package org.openmbee.mdk.emf; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.*; @@ -16,13 +16,13 @@ import com.nomagic.uml2.ext.magicdraw.compositestructures.mdinternalstructures.Connector; import com.nomagic.uml2.ext.magicdraw.mdprofiles.Stereotype; import com.nomagic.uml2.ext.magicdraw.metadata.UMLPackage; -import gov.nasa.jpl.mbee.mdk.SysMLExtensions; -import gov.nasa.jpl.mbee.mdk.api.function.TriFunction; -import gov.nasa.jpl.mbee.mdk.api.incubating.MDKConstants; -import gov.nasa.jpl.mbee.mdk.api.incubating.convert.Converters; -import gov.nasa.jpl.mbee.mdk.api.stream.MDKCollectors; -import gov.nasa.jpl.mbee.mdk.json.JacksonUtils; -import gov.nasa.jpl.mbee.mdk.util.Utils; +import org.openmbee.mdk.SysMLExtensions; +import org.openmbee.mdk.api.function.TriFunction; +import org.openmbee.mdk.api.incubating.MDKConstants; +import org.openmbee.mdk.api.incubating.convert.Converters; +import org.openmbee.mdk.api.stream.MDKCollectors; +import org.openmbee.mdk.json.JacksonUtils; +import org.openmbee.mdk.util.Utils; import org.eclipse.emf.ecore.EDataType; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EReference; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/emf/EMFImporter.java b/src/main/java/org/openmbee/mdk/emf/EMFImporter.java similarity index 98% rename from src/main/java/gov/nasa/jpl/mbee/mdk/emf/EMFImporter.java rename to src/main/java/org/openmbee/mdk/emf/EMFImporter.java index 281457814..168191dbe 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/emf/EMFImporter.java +++ b/src/main/java/org/openmbee/mdk/emf/EMFImporter.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.emf; +package org.openmbee.mdk.emf; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ArrayNode; @@ -20,14 +20,14 @@ import com.nomagic.uml2.ext.magicdraw.mdprofiles.Stereotype; import com.nomagic.uml2.ext.magicdraw.metadata.UMLFactory; import com.nomagic.uml2.ext.magicdraw.metadata.UMLPackage; -import gov.nasa.jpl.mbee.mdk.api.function.TriFunction; -import gov.nasa.jpl.mbee.mdk.api.incubating.MDKConstants; -import gov.nasa.jpl.mbee.mdk.api.incubating.convert.Converters; -import gov.nasa.jpl.mbee.mdk.api.incubating.convert.JsonToElementFunction; -import gov.nasa.jpl.mbee.mdk.json.ImportException; -import gov.nasa.jpl.mbee.mdk.json.JacksonUtils; -import gov.nasa.jpl.mbee.mdk.json.ReferenceException; -import gov.nasa.jpl.mbee.mdk.util.Changelog; +import org.openmbee.mdk.api.function.TriFunction; +import org.openmbee.mdk.api.incubating.MDKConstants; +import org.openmbee.mdk.api.incubating.convert.Converters; +import org.openmbee.mdk.api.incubating.convert.JsonToElementFunction; +import org.openmbee.mdk.json.ImportException; +import org.openmbee.mdk.json.JacksonUtils; +import org.openmbee.mdk.json.ReferenceException; +import org.openmbee.mdk.util.Changelog; import org.eclipse.emf.common.util.BasicEList; import org.eclipse.emf.common.util.UniqueEList; import org.eclipse.emf.ecore.*; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/emf/EmfUtils.java b/src/main/java/org/openmbee/mdk/emf/EmfUtils.java similarity index 99% rename from src/main/java/gov/nasa/jpl/mbee/mdk/emf/EmfUtils.java rename to src/main/java/org/openmbee/mdk/emf/EmfUtils.java index e48b96703..3693b8bc7 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/emf/EmfUtils.java +++ b/src/main/java/org/openmbee/mdk/emf/EmfUtils.java @@ -1,15 +1,15 @@ -package gov.nasa.jpl.mbee.mdk.emf; +package org.openmbee.mdk.emf; import com.nomagic.uml2.ext.jmi.helpers.StereotypesHelper; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; import com.nomagic.uml2.ext.magicdraw.mdprofiles.Stereotype; -import gov.nasa.jpl.mbee.mdk.api.incubating.convert.Converters; -import gov.nasa.jpl.mbee.mdk.util.*; +import org.openmbee.mdk.api.incubating.convert.Converters; import junit.framework.Assert; import org.eclipse.emf.ecore.EClassifier; import org.eclipse.emf.ecore.ENamedElement; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; +import org.openmbee.mdk.util.*; import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/CollectFilterNode.java b/src/main/java/org/openmbee/mdk/generator/CollectFilterNode.java similarity index 95% rename from src/main/java/gov/nasa/jpl/mbee/mdk/generator/CollectFilterNode.java rename to src/main/java/org/openmbee/mdk/generator/CollectFilterNode.java index fbb695a7f..3da24d9a7 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/CollectFilterNode.java +++ b/src/main/java/org/openmbee/mdk/generator/CollectFilterNode.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.generator; +package org.openmbee.mdk.generator; import com.nomagic.uml2.ext.magicdraw.activities.mdfundamentalactivities.ActivityNode; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/CollectFilterParser.java b/src/main/java/org/openmbee/mdk/generator/CollectFilterParser.java similarity index 97% rename from src/main/java/gov/nasa/jpl/mbee/mdk/generator/CollectFilterParser.java rename to src/main/java/org/openmbee/mdk/generator/CollectFilterParser.java index 20d4a1211..839057843 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/CollectFilterParser.java +++ b/src/main/java/org/openmbee/mdk/generator/CollectFilterParser.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.generator; +package org.openmbee.mdk.generator; import com.nomagic.uml2.ext.jmi.helpers.StereotypesHelper; import com.nomagic.uml2.ext.magicdraw.actions.mdbasicactions.CallBehaviorAction; @@ -14,15 +14,15 @@ import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.*; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Class; import com.nomagic.uml2.ext.magicdraw.mdprofiles.Stereotype; -import gov.nasa.jpl.mbee.mdk.SysMLExtensions; -import gov.nasa.jpl.mbee.mdk.docgen.ViewViewpointValidator; -import gov.nasa.jpl.mbee.mdk.generator.graphs.DirectedEdgeVector; -import gov.nasa.jpl.mbee.mdk.generator.graphs.DirectedGraphHashSet; -import gov.nasa.jpl.mbee.mdk.generator.graphs.algorithms.TopologicalSort; -import gov.nasa.jpl.mbee.mdk.util.GeneratorUtils; -import gov.nasa.jpl.mbee.mdk.util.ScriptRunner; -import gov.nasa.jpl.mbee.mdk.util.Utils; -import gov.nasa.jpl.mbee.mdk.util.Utils2; +import org.openmbee.mdk.SysMLExtensions; +import org.openmbee.mdk.docgen.ViewViewpointValidator; +import org.openmbee.mdk.generator.graphs.DirectedEdgeVector; +import org.openmbee.mdk.generator.graphs.DirectedGraphHashSet; +import org.openmbee.mdk.generator.graphs.algorithms.TopologicalSort; +import org.openmbee.mdk.util.GeneratorUtils; +import org.openmbee.mdk.util.ScriptRunner; +import org.openmbee.mdk.util.Utils; +import org.openmbee.mdk.util.Utils2; import org.apache.log4j.Logger; import javax.script.ScriptException; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/DiagramTableTool.java b/src/main/java/org/openmbee/mdk/generator/DiagramTableTool.java similarity index 98% rename from src/main/java/gov/nasa/jpl/mbee/mdk/generator/DiagramTableTool.java rename to src/main/java/org/openmbee/mdk/generator/DiagramTableTool.java index ad429f577..3ab8b9123 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/DiagramTableTool.java +++ b/src/main/java/org/openmbee/mdk/generator/DiagramTableTool.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.generator; +package org.openmbee.mdk.generator; /** * This class is copied from NoMagic's DiagramTableTool in diagramtabletool.jar @@ -20,7 +20,7 @@ import com.nomagic.magicdraw.uml.symbols.DiagramPresentationElement; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Diagram; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; -import gov.nasa.jpl.mbee.mdk.util.Debug; +import org.openmbee.mdk.util.Debug; import java.util.*; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/Document2PdfWriter.java b/src/main/java/org/openmbee/mdk/generator/Document2PdfWriter.java similarity index 93% rename from src/main/java/gov/nasa/jpl/mbee/mdk/generator/Document2PdfWriter.java rename to src/main/java/org/openmbee/mdk/generator/Document2PdfWriter.java index 7269b863a..ba6f500cf 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/Document2PdfWriter.java +++ b/src/main/java/org/openmbee/mdk/generator/Document2PdfWriter.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.generator; +package org.openmbee.mdk.generator; import com.nomagic.task.ProgressStatus; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/DocumentGenerator.java b/src/main/java/org/openmbee/mdk/generator/DocumentGenerator.java similarity index 98% rename from src/main/java/gov/nasa/jpl/mbee/mdk/generator/DocumentGenerator.java rename to src/main/java/org/openmbee/mdk/generator/DocumentGenerator.java index 6720d17c2..1599dabfd 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/DocumentGenerator.java +++ b/src/main/java/org/openmbee/mdk/generator/DocumentGenerator.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.generator; +package org.openmbee.mdk.generator; import com.nomagic.magicdraw.core.Application; import com.nomagic.magicdraw.core.Project; @@ -17,13 +17,13 @@ import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Class; import com.nomagic.uml2.ext.magicdraw.commonbehaviors.mdbasicbehaviors.Behavior; import com.nomagic.uml2.ext.magicdraw.mdprofiles.Stereotype; -import gov.nasa.jpl.mbee.mdk.MDKPlugin; -import gov.nasa.jpl.mbee.mdk.SysMLExtensions; -import gov.nasa.jpl.mbee.mdk.api.incubating.convert.Converters; -import gov.nasa.jpl.mbee.mdk.docgen.ViewViewpointValidator; -import gov.nasa.jpl.mbee.mdk.docgen.docbook.From; -import gov.nasa.jpl.mbee.mdk.model.*; -import gov.nasa.jpl.mbee.mdk.util.*; +import org.openmbee.mdk.MDKPlugin; +import org.openmbee.mdk.SysMLExtensions; +import org.openmbee.mdk.api.incubating.convert.Converters; +import org.openmbee.mdk.docgen.ViewViewpointValidator; +import org.openmbee.mdk.docgen.docbook.From; +import org.openmbee.mdk.model.*; +import org.openmbee.mdk.util.*; import java.io.PrintWriter; import java.util.ArrayList; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/DocumentViewer.java b/src/main/java/org/openmbee/mdk/generator/DocumentViewer.java similarity index 95% rename from src/main/java/gov/nasa/jpl/mbee/mdk/generator/DocumentViewer.java rename to src/main/java/org/openmbee/mdk/generator/DocumentViewer.java index a70428b47..68a6abed2 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/DocumentViewer.java +++ b/src/main/java/org/openmbee/mdk/generator/DocumentViewer.java @@ -1,11 +1,11 @@ -package gov.nasa.jpl.mbee.mdk.generator; +package org.openmbee.mdk.generator; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.NamedElement; -import gov.nasa.jpl.mbee.mdk.docgen.DocGenUtils; -import gov.nasa.jpl.mbee.mdk.docgen.table.EditableTable; -import gov.nasa.jpl.mbee.mdk.model.Container; -import gov.nasa.jpl.mbee.mdk.model.*; +import org.openmbee.mdk.docgen.DocGenUtils; +import org.openmbee.mdk.docgen.table.EditableTable; +import org.openmbee.mdk.model.*; +import org.openmbee.mdk.model.Container; import javax.swing.*; import javax.swing.table.TableCellRenderer; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/DocumentWriter.java b/src/main/java/org/openmbee/mdk/generator/DocumentWriter.java similarity index 90% rename from src/main/java/gov/nasa/jpl/mbee/mdk/generator/DocumentWriter.java rename to src/main/java/org/openmbee/mdk/generator/DocumentWriter.java index 92709041a..62a8e90ed 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/DocumentWriter.java +++ b/src/main/java/org/openmbee/mdk/generator/DocumentWriter.java @@ -1,14 +1,14 @@ -package gov.nasa.jpl.mbee.mdk.generator; +package org.openmbee.mdk.generator; import com.nomagic.magicdraw.core.Application; import com.nomagic.magicdraw.openapi.uml.SessionManager; import com.nomagic.task.ProgressStatus; import com.nomagic.task.RunnableWithProgress; -import gov.nasa.jpl.mbee.mdk.docgen.docbook.DBBook; -import gov.nasa.jpl.mbee.mdk.docgen.docbook.DBSerializeVisitor; -import gov.nasa.jpl.mbee.mdk.model.DocBookOutputVisitor; -import gov.nasa.jpl.mbee.mdk.model.Document; +import org.openmbee.mdk.docgen.docbook.DBBook; +import org.openmbee.mdk.docgen.docbook.DBSerializeVisitor; +import org.openmbee.mdk.model.DocBookOutputVisitor; +import org.openmbee.mdk.model.Document; import java.io.BufferedWriter; import java.io.File; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/Generatable.java b/src/main/java/org/openmbee/mdk/generator/Generatable.java similarity index 65% rename from src/main/java/gov/nasa/jpl/mbee/mdk/generator/Generatable.java rename to src/main/java/org/openmbee/mdk/generator/Generatable.java index fae2cdeda..22bef2ae6 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/Generatable.java +++ b/src/main/java/org/openmbee/mdk/generator/Generatable.java @@ -1,7 +1,8 @@ -package gov.nasa.jpl.mbee.mdk.generator; +package org.openmbee.mdk.generator; import com.nomagic.magicdraw.actions.MDAction; -import gov.nasa.jpl.mbee.mdk.docgen.docbook.DocumentElement; +import org.openmbee.mdk.docgen.docbook.DocumentElement; +import org.openmbee.mdk.model.Query; import java.util.List; @@ -10,7 +11,7 @@ * Interface for all DocGen queries. *

* - * @see gov.nasa.jpl.mbee.mdk.model.Query for writing java extensions + * @see Query for writing java extensions */ public interface Generatable { diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/GenerationContext.java b/src/main/java/org/openmbee/mdk/generator/GenerationContext.java similarity index 94% rename from src/main/java/gov/nasa/jpl/mbee/mdk/generator/GenerationContext.java rename to src/main/java/org/openmbee/mdk/generator/GenerationContext.java index 8d02ab2e6..610e6c31f 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/GenerationContext.java +++ b/src/main/java/org/openmbee/mdk/generator/GenerationContext.java @@ -1,8 +1,8 @@ -package gov.nasa.jpl.mbee.mdk.generator; +package org.openmbee.mdk.generator; import com.nomagic.magicdraw.core.GUILog; import com.nomagic.uml2.ext.magicdraw.activities.mdfundamentalactivities.ActivityNode; -import gov.nasa.jpl.mbee.mdk.docgen.ViewViewpointValidator; +import org.openmbee.mdk.docgen.ViewViewpointValidator; import java.util.List; import java.util.Stack; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/PdfWriter.java b/src/main/java/org/openmbee/mdk/generator/PdfWriter.java similarity index 96% rename from src/main/java/gov/nasa/jpl/mbee/mdk/generator/PdfWriter.java rename to src/main/java/org/openmbee/mdk/generator/PdfWriter.java index 13f38929c..3bbdcdbc9 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/PdfWriter.java +++ b/src/main/java/org/openmbee/mdk/generator/PdfWriter.java @@ -1,10 +1,10 @@ -package gov.nasa.jpl.mbee.mdk.generator; +package org.openmbee.mdk.generator; import com.nomagic.magicdraw.core.Application; import com.nomagic.task.ProgressStatus; import com.nomagic.task.RunnableWithProgress; -import gov.nasa.jpl.mbee.mdk.MDKPlugin; -import gov.nasa.jpl.mbee.mdk.model.Document; +import org.openmbee.mdk.MDKPlugin; +import org.openmbee.mdk.model.Document; import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.fop.apps.*; @@ -72,7 +72,7 @@ protected void document2Pdf() { //make currentloader to be mainloader (batik, fop, xmlgraphics jar need to be loaded at the same level so images to be embedded in PDF). URL[] urls = new URL[1]; - //urls[0] = (new File(ApplicationEnvironment.getInstallRoot() + File.separator + "plugins" + File.separator + "gov.nasa.jpl.mbee.mdk")).toURI().toURL(); + //urls[0] = (new File(ApplicationEnvironment.getInstallRoot() + File.separator + "plugins" + File.separator + "org.openmbee.mdk")).toURI().toURL(); urls[0] = MDKPlugin.getInstance().getDescriptor().getPluginDirectory().toURI().toURL(); URLClassLoader mainClassLoader = new URLClassLoader(urls, Application.class.getClassLoader()); Thread.currentThread().setContextClassLoader(mainClassLoader); diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/PostProcessor.java b/src/main/java/org/openmbee/mdk/generator/PostProcessor.java similarity index 86% rename from src/main/java/gov/nasa/jpl/mbee/mdk/generator/PostProcessor.java rename to src/main/java/org/openmbee/mdk/generator/PostProcessor.java index 522fd7ece..0d26c3130 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/PostProcessor.java +++ b/src/main/java/org/openmbee/mdk/generator/PostProcessor.java @@ -1,9 +1,9 @@ -package gov.nasa.jpl.mbee.mdk.generator; +package org.openmbee.mdk.generator; -import gov.nasa.jpl.mbee.mdk.model.Container; -import gov.nasa.jpl.mbee.mdk.model.DocGenElement; -import gov.nasa.jpl.mbee.mdk.model.Document; -import gov.nasa.jpl.mbee.mdk.model.Query; +import org.openmbee.mdk.model.Container; +import org.openmbee.mdk.model.DocGenElement; +import org.openmbee.mdk.model.Document; +import org.openmbee.mdk.model.Query; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/PresentationElementInfo.java b/src/main/java/org/openmbee/mdk/generator/PresentationElementInfo.java similarity index 98% rename from src/main/java/gov/nasa/jpl/mbee/mdk/generator/PresentationElementInfo.java rename to src/main/java/org/openmbee/mdk/generator/PresentationElementInfo.java index 890fe2fcd..4dac8d607 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/PresentationElementInfo.java +++ b/src/main/java/org/openmbee/mdk/generator/PresentationElementInfo.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.generator; +package org.openmbee.mdk.generator; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.InstanceSpecification; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/PresentationElementInstance.java b/src/main/java/org/openmbee/mdk/generator/PresentationElementInstance.java similarity index 95% rename from src/main/java/gov/nasa/jpl/mbee/mdk/generator/PresentationElementInstance.java rename to src/main/java/org/openmbee/mdk/generator/PresentationElementInstance.java index b55bba1c8..51af44476 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/PresentationElementInstance.java +++ b/src/main/java/org/openmbee/mdk/generator/PresentationElementInstance.java @@ -1,8 +1,8 @@ -package gov.nasa.jpl.mbee.mdk.generator; +package org.openmbee.mdk.generator; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.InstanceSpecification; -import gov.nasa.jpl.mbee.mdk.api.docgen.uml.classes.PresentationElementClasses; +import org.openmbee.mdk.api.docgen.uml.classes.PresentationElementClasses; import org.json.simple.JSONObject; import java.util.List; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/PresentationElementUtils.java b/src/main/java/org/openmbee/mdk/generator/PresentationElementUtils.java similarity index 98% rename from src/main/java/gov/nasa/jpl/mbee/mdk/generator/PresentationElementUtils.java rename to src/main/java/org/openmbee/mdk/generator/PresentationElementUtils.java index e718a6c3a..458e509ed 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/PresentationElementUtils.java +++ b/src/main/java/org/openmbee/mdk/generator/PresentationElementUtils.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.generator; +package org.openmbee.mdk.generator; import com.nomagic.magicdraw.commands.Command; import com.nomagic.magicdraw.commands.CommandHistory; @@ -10,10 +10,10 @@ import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Class; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Package; import com.nomagic.uml2.impl.ElementsFactory; -import gov.nasa.jpl.mbee.mdk.api.docgen.uml.classes.PresentationElementClasses; -import gov.nasa.jpl.mbee.mdk.api.incubating.MDKConstants; -import gov.nasa.jpl.mbee.mdk.api.incubating.convert.Converters; -import gov.nasa.jpl.mbee.mdk.util.Utils; +import org.openmbee.mdk.api.docgen.uml.classes.PresentationElementClasses; +import org.openmbee.mdk.api.incubating.MDKConstants; +import org.openmbee.mdk.api.incubating.convert.Converters; +import org.openmbee.mdk.util.Utils; import org.json.simple.JSONObject; import org.json.simple.parser.JSONParser; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/ProductViewParser.java b/src/main/java/org/openmbee/mdk/generator/ProductViewParser.java similarity index 91% rename from src/main/java/gov/nasa/jpl/mbee/mdk/generator/ProductViewParser.java rename to src/main/java/org/openmbee/mdk/generator/ProductViewParser.java index 3459618b1..964f24e9f 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/ProductViewParser.java +++ b/src/main/java/org/openmbee/mdk/generator/ProductViewParser.java @@ -1,20 +1,18 @@ -package gov.nasa.jpl.mbee.mdk.generator; +package org.openmbee.mdk.generator; import com.nomagic.magicdraw.core.Application; import com.nomagic.uml2.ext.jmi.helpers.StereotypesHelper; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.*; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Class; import com.nomagic.uml2.ext.magicdraw.mdprofiles.Stereotype; -import gov.nasa.jpl.mbee.mdk.model.Container; -import gov.nasa.jpl.mbee.mdk.model.DocGenElement; -import gov.nasa.jpl.mbee.mdk.model.Document; -import gov.nasa.jpl.mbee.mdk.model.Section; -import gov.nasa.jpl.mbee.mdk.util.Pair; +import org.openmbee.mdk.model.Container; +import org.openmbee.mdk.model.DocGenElement; +import org.openmbee.mdk.model.Document; +import org.openmbee.mdk.model.Section; +import org.openmbee.mdk.util.Pair; import java.util.ArrayList; -import java.util.HashSet; import java.util.List; -import java.util.Set; /** * This parses a view structure and Product spec that uses associations for diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/ViewParser.java b/src/main/java/org/openmbee/mdk/generator/ViewParser.java similarity index 85% rename from src/main/java/gov/nasa/jpl/mbee/mdk/generator/ViewParser.java rename to src/main/java/org/openmbee/mdk/generator/ViewParser.java index df1044f0f..8f581abcf 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/ViewParser.java +++ b/src/main/java/org/openmbee/mdk/generator/ViewParser.java @@ -1,12 +1,12 @@ -package gov.nasa.jpl.mbee.mdk.generator; +package org.openmbee.mdk.generator; import com.nomagic.uml2.ext.jmi.helpers.StereotypesHelper; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; import com.nomagic.uml2.ext.magicdraw.mdprofiles.Stereotype; -import gov.nasa.jpl.mbee.mdk.SysMLExtensions; -import gov.nasa.jpl.mbee.mdk.model.Container; -import gov.nasa.jpl.mbee.mdk.model.Document; -import gov.nasa.jpl.mbee.mdk.model.Section; +import org.openmbee.mdk.SysMLExtensions; +import org.openmbee.mdk.model.Container; +import org.openmbee.mdk.model.Document; +import org.openmbee.mdk.model.Section; /** * diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/ViewPresentationGenerator.java b/src/main/java/org/openmbee/mdk/generator/ViewPresentationGenerator.java similarity index 96% rename from src/main/java/gov/nasa/jpl/mbee/mdk/generator/ViewPresentationGenerator.java rename to src/main/java/org/openmbee/mdk/generator/ViewPresentationGenerator.java index d5c655e7c..f340a60ae 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/ViewPresentationGenerator.java +++ b/src/main/java/org/openmbee/mdk/generator/ViewPresentationGenerator.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.generator; +package org.openmbee.mdk.generator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.JsonNode; @@ -18,34 +18,33 @@ import com.nomagic.task.RunnableWithProgress; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Package; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.*; -import gov.nasa.jpl.mbee.mdk.SysMLExtensions; -import gov.nasa.jpl.mbee.mdk.api.incubating.MDKConstants; -import gov.nasa.jpl.mbee.mdk.api.incubating.convert.Converters; -import gov.nasa.jpl.mbee.mdk.docgen.ViewViewpointValidator; -import gov.nasa.jpl.mbee.mdk.docgen.docbook.DBBook; -import gov.nasa.jpl.mbee.mdk.docgen.docbook.DBImage; -import gov.nasa.jpl.mbee.mdk.emf.EMFImporter; -import gov.nasa.jpl.mbee.mdk.http.ServerException; -import gov.nasa.jpl.mbee.mdk.json.ImportException; -import gov.nasa.jpl.mbee.mdk.json.JacksonUtils; -import gov.nasa.jpl.mbee.mdk.mms.MMSUtils; -import gov.nasa.jpl.mbee.mdk.mms.actions.CommitDiagramArtifactsAction; -import gov.nasa.jpl.mbee.mdk.mms.endpoints.MMSElementsEndpoint; -import gov.nasa.jpl.mbee.mdk.mms.endpoints.MMSEndpointBuilderConstants; -import gov.nasa.jpl.mbee.mdk.mms.json.JsonEquivalencePredicate; -import gov.nasa.jpl.mbee.mdk.mms.json.JsonPatchFunction; -import gov.nasa.jpl.mbee.mdk.mms.sync.local.LocalDeltaProjectEventListenerAdapter; -import gov.nasa.jpl.mbee.mdk.mms.sync.local.LocalDeltaTransactionCommitListener; -import gov.nasa.jpl.mbee.mdk.mms.validation.DiagramValidator; -import gov.nasa.jpl.mbee.mdk.model.DocBookOutputVisitor; -import gov.nasa.jpl.mbee.mdk.model.Document; -import gov.nasa.jpl.mbee.mdk.util.*; -import gov.nasa.jpl.mbee.mdk.validation.ValidationRule; -import gov.nasa.jpl.mbee.mdk.validation.ValidationRuleViolation; -import gov.nasa.jpl.mbee.mdk.validation.ValidationSuite; -import gov.nasa.jpl.mbee.mdk.validation.ViolationSeverity; -import gov.nasa.jpl.mbee.mdk.viewedit.DBAlfrescoVisitor; -import gov.nasa.jpl.mbee.mdk.viewedit.ViewHierarchyVisitor; +import org.openmbee.mdk.api.incubating.MDKConstants; +import org.openmbee.mdk.api.incubating.convert.Converters; +import org.openmbee.mdk.docgen.ViewViewpointValidator; +import org.openmbee.mdk.docgen.docbook.DBBook; +import org.openmbee.mdk.docgen.docbook.DBImage; +import org.openmbee.mdk.emf.EMFImporter; +import org.openmbee.mdk.http.ServerException; +import org.openmbee.mdk.json.ImportException; +import org.openmbee.mdk.json.JacksonUtils; +import org.openmbee.mdk.mms.MMSUtils; +import org.openmbee.mdk.mms.actions.CommitDiagramArtifactsAction; +import org.openmbee.mdk.mms.endpoints.MMSElementsEndpoint; +import org.openmbee.mdk.mms.endpoints.MMSEndpointBuilderConstants; +import org.openmbee.mdk.mms.json.JsonEquivalencePredicate; +import org.openmbee.mdk.mms.json.JsonPatchFunction; +import org.openmbee.mdk.mms.sync.local.LocalDeltaProjectEventListenerAdapter; +import org.openmbee.mdk.mms.sync.local.LocalDeltaTransactionCommitListener; +import org.openmbee.mdk.mms.validation.DiagramValidator; +import org.openmbee.mdk.model.DocBookOutputVisitor; +import org.openmbee.mdk.model.Document; +import org.openmbee.mdk.util.*; +import org.openmbee.mdk.validation.ValidationRule; +import org.openmbee.mdk.validation.ValidationRuleViolation; +import org.openmbee.mdk.validation.ValidationSuite; +import org.openmbee.mdk.validation.ViolationSeverity; +import org.openmbee.mdk.viewedit.DBAlfrescoVisitor; +import org.openmbee.mdk.viewedit.ViewHierarchyVisitor; import org.apache.http.client.methods.HttpRequestBase; import org.apache.http.entity.ContentType; import org.json.simple.JSONArray; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/AbstractGraph.java b/src/main/java/org/openmbee/mdk/generator/graphs/AbstractGraph.java similarity index 98% rename from src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/AbstractGraph.java rename to src/main/java/org/openmbee/mdk/generator/graphs/AbstractGraph.java index 57175c759..9aa0eff2f 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/AbstractGraph.java +++ b/src/main/java/org/openmbee/mdk/generator/graphs/AbstractGraph.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.generator.graphs; +package org.openmbee.mdk.generator.graphs; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/DirectedEdge.java b/src/main/java/org/openmbee/mdk/generator/graphs/DirectedEdge.java similarity index 79% rename from src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/DirectedEdge.java rename to src/main/java/org/openmbee/mdk/generator/graphs/DirectedEdge.java index ef9a74553..343750d9d 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/DirectedEdge.java +++ b/src/main/java/org/openmbee/mdk/generator/graphs/DirectedEdge.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.generator.graphs; +package org.openmbee.mdk.generator.graphs; public interface DirectedEdge extends DirectedHyperEdge, UndirectedEdge { VertexType getSourceVertex(); diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/DirectedEdgeVector.java b/src/main/java/org/openmbee/mdk/generator/graphs/DirectedEdgeVector.java similarity index 95% rename from src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/DirectedEdgeVector.java rename to src/main/java/org/openmbee/mdk/generator/graphs/DirectedEdgeVector.java index 04ecd9ed6..255735748 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/DirectedEdgeVector.java +++ b/src/main/java/org/openmbee/mdk/generator/graphs/DirectedEdgeVector.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.generator.graphs; +package org.openmbee.mdk.generator.graphs; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/DirectedGraph.java b/src/main/java/org/openmbee/mdk/generator/graphs/DirectedGraph.java similarity index 82% rename from src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/DirectedGraph.java rename to src/main/java/org/openmbee/mdk/generator/graphs/DirectedGraph.java index 6dedbe9c5..286d352d6 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/DirectedGraph.java +++ b/src/main/java/org/openmbee/mdk/generator/graphs/DirectedGraph.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.generator.graphs; +package org.openmbee.mdk.generator.graphs; public interface DirectedGraph> extends DirectedHyperGraph { diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/DirectedGraphHashSet.java b/src/main/java/org/openmbee/mdk/generator/graphs/DirectedGraphHashSet.java similarity index 95% rename from src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/DirectedGraphHashSet.java rename to src/main/java/org/openmbee/mdk/generator/graphs/DirectedGraphHashSet.java index 55b571fdc..e4e17f885 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/DirectedGraphHashSet.java +++ b/src/main/java/org/openmbee/mdk/generator/graphs/DirectedGraphHashSet.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.generator.graphs; +package org.openmbee.mdk.generator.graphs; import java.util.Set; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/DirectedHyperEdge.java b/src/main/java/org/openmbee/mdk/generator/graphs/DirectedHyperEdge.java similarity index 80% rename from src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/DirectedHyperEdge.java rename to src/main/java/org/openmbee/mdk/generator/graphs/DirectedHyperEdge.java index c86d5d18a..9fcc41ee4 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/DirectedHyperEdge.java +++ b/src/main/java/org/openmbee/mdk/generator/graphs/DirectedHyperEdge.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.generator.graphs; +package org.openmbee.mdk.generator.graphs; import java.util.Set; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/DirectedHyperEdgeVector.java b/src/main/java/org/openmbee/mdk/generator/graphs/DirectedHyperEdgeVector.java similarity index 97% rename from src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/DirectedHyperEdgeVector.java rename to src/main/java/org/openmbee/mdk/generator/graphs/DirectedHyperEdgeVector.java index d88e5c14a..59e999989 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/DirectedHyperEdgeVector.java +++ b/src/main/java/org/openmbee/mdk/generator/graphs/DirectedHyperEdgeVector.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.generator.graphs; +package org.openmbee.mdk.generator.graphs; import java.util.Set; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/DirectedHyperGraph.java b/src/main/java/org/openmbee/mdk/generator/graphs/DirectedHyperGraph.java similarity index 91% rename from src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/DirectedHyperGraph.java rename to src/main/java/org/openmbee/mdk/generator/graphs/DirectedHyperGraph.java index 8276e5079..378f8caf2 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/DirectedHyperGraph.java +++ b/src/main/java/org/openmbee/mdk/generator/graphs/DirectedHyperGraph.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.generator.graphs; +package org.openmbee.mdk.generator.graphs; import java.util.Set; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/DirectedHyperGraphHashSet.java b/src/main/java/org/openmbee/mdk/generator/graphs/DirectedHyperGraphHashSet.java similarity index 99% rename from src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/DirectedHyperGraphHashSet.java rename to src/main/java/org/openmbee/mdk/generator/graphs/DirectedHyperGraphHashSet.java index 4b648b3e2..0822ce649 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/DirectedHyperGraphHashSet.java +++ b/src/main/java/org/openmbee/mdk/generator/graphs/DirectedHyperGraphHashSet.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.generator.graphs; +package org.openmbee.mdk.generator.graphs; import java.util.HashMap; import java.util.HashSet; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/Edge.java b/src/main/java/org/openmbee/mdk/generator/graphs/Edge.java similarity index 83% rename from src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/Edge.java rename to src/main/java/org/openmbee/mdk/generator/graphs/Edge.java index afe4a9aea..918bb28dd 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/Edge.java +++ b/src/main/java/org/openmbee/mdk/generator/graphs/Edge.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.generator.graphs; +package org.openmbee.mdk.generator.graphs; import java.util.Collection; import java.util.List; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/Graph.java b/src/main/java/org/openmbee/mdk/generator/graphs/Graph.java similarity index 94% rename from src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/Graph.java rename to src/main/java/org/openmbee/mdk/generator/graphs/Graph.java index df15ec4d6..c72aace09 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/Graph.java +++ b/src/main/java/org/openmbee/mdk/generator/graphs/Graph.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.generator.graphs; +package org.openmbee.mdk.generator.graphs; import java.util.Set; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/UndirectedEdge.java b/src/main/java/org/openmbee/mdk/generator/graphs/UndirectedEdge.java similarity index 65% rename from src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/UndirectedEdge.java rename to src/main/java/org/openmbee/mdk/generator/graphs/UndirectedEdge.java index bbced0cbe..a45f5ae5e 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/UndirectedEdge.java +++ b/src/main/java/org/openmbee/mdk/generator/graphs/UndirectedEdge.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.generator.graphs; +package org.openmbee.mdk.generator.graphs; public interface UndirectedEdge extends UndirectedHyperEdge { diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/UndirectedEdgeVector.java b/src/main/java/org/openmbee/mdk/generator/graphs/UndirectedEdgeVector.java similarity index 93% rename from src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/UndirectedEdgeVector.java rename to src/main/java/org/openmbee/mdk/generator/graphs/UndirectedEdgeVector.java index b25d9f17c..df2a493dc 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/UndirectedEdgeVector.java +++ b/src/main/java/org/openmbee/mdk/generator/graphs/UndirectedEdgeVector.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.generator.graphs; +package org.openmbee.mdk.generator.graphs; import java.util.Collection; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/UndirectedHyperEdge.java b/src/main/java/org/openmbee/mdk/generator/graphs/UndirectedHyperEdge.java similarity index 62% rename from src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/UndirectedHyperEdge.java rename to src/main/java/org/openmbee/mdk/generator/graphs/UndirectedHyperEdge.java index ec9b7f31e..95e7d4b44 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/UndirectedHyperEdge.java +++ b/src/main/java/org/openmbee/mdk/generator/graphs/UndirectedHyperEdge.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.generator.graphs; +package org.openmbee.mdk.generator.graphs; public interface UndirectedHyperEdge extends Edge { diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/UndirectedHyperEdgeVector.java b/src/main/java/org/openmbee/mdk/generator/graphs/UndirectedHyperEdgeVector.java similarity index 96% rename from src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/UndirectedHyperEdgeVector.java rename to src/main/java/org/openmbee/mdk/generator/graphs/UndirectedHyperEdgeVector.java index 149383ed7..e87fdcd36 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/UndirectedHyperEdgeVector.java +++ b/src/main/java/org/openmbee/mdk/generator/graphs/UndirectedHyperEdgeVector.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.generator.graphs; +package org.openmbee.mdk.generator.graphs; import java.util.Collection; import java.util.List; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/UndirectedHyperGraph.java b/src/main/java/org/openmbee/mdk/generator/graphs/UndirectedHyperGraph.java similarity index 75% rename from src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/UndirectedHyperGraph.java rename to src/main/java/org/openmbee/mdk/generator/graphs/UndirectedHyperGraph.java index 7a713e741..8cf650fbe 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/UndirectedHyperGraph.java +++ b/src/main/java/org/openmbee/mdk/generator/graphs/UndirectedHyperGraph.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.generator.graphs; +package org.openmbee.mdk.generator.graphs; public interface UndirectedHyperGraph> extends Graph { diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/UndirectedHyperGraphHashSet.java b/src/main/java/org/openmbee/mdk/generator/graphs/UndirectedHyperGraphHashSet.java similarity index 98% rename from src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/UndirectedHyperGraphHashSet.java rename to src/main/java/org/openmbee/mdk/generator/graphs/UndirectedHyperGraphHashSet.java index 5f0023308..d0473d8b3 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/UndirectedHyperGraphHashSet.java +++ b/src/main/java/org/openmbee/mdk/generator/graphs/UndirectedHyperGraphHashSet.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.generator.graphs; +package org.openmbee.mdk.generator.graphs; import java.util.HashMap; import java.util.HashSet; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/algorithms/DepthFirstSearch.java b/src/main/java/org/openmbee/mdk/generator/graphs/algorithms/DepthFirstSearch.java similarity index 98% rename from src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/algorithms/DepthFirstSearch.java rename to src/main/java/org/openmbee/mdk/generator/graphs/algorithms/DepthFirstSearch.java index 10533cc3e..d552b4cd3 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/algorithms/DepthFirstSearch.java +++ b/src/main/java/org/openmbee/mdk/generator/graphs/algorithms/DepthFirstSearch.java @@ -1,6 +1,6 @@ -package gov.nasa.jpl.mbee.mdk.generator.graphs.algorithms; +package org.openmbee.mdk.generator.graphs.algorithms; -import gov.nasa.jpl.mbee.mdk.generator.graphs.*; +import org.openmbee.mdk.generator.graphs.*; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/algorithms/TopologicalSort.java b/src/main/java/org/openmbee/mdk/generator/graphs/algorithms/TopologicalSort.java similarity index 92% rename from src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/algorithms/TopologicalSort.java rename to src/main/java/org/openmbee/mdk/generator/graphs/algorithms/TopologicalSort.java index 201d4fe6b..96ec45f2f 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/algorithms/TopologicalSort.java +++ b/src/main/java/org/openmbee/mdk/generator/graphs/algorithms/TopologicalSort.java @@ -1,7 +1,7 @@ -package gov.nasa.jpl.mbee.mdk.generator.graphs.algorithms; +package org.openmbee.mdk.generator.graphs.algorithms; -import gov.nasa.jpl.mbee.mdk.generator.graphs.Edge; -import gov.nasa.jpl.mbee.mdk.generator.graphs.Graph; +import org.openmbee.mdk.generator.graphs.Edge; +import org.openmbee.mdk.generator.graphs.Graph; import java.util.*; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/package-info.java b/src/main/java/org/openmbee/mdk/generator/graphs/package-info.java similarity index 85% rename from src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/package-info.java rename to src/main/java/org/openmbee/mdk/generator/graphs/package-info.java index e1c272064..f30366e7c 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/generator/graphs/package-info.java +++ b/src/main/java/org/openmbee/mdk/generator/graphs/package-info.java @@ -4,4 +4,4 @@ * using these (for topological sort) when parsing viewpoint activities, so need * to convert those first. **/ -package gov.nasa.jpl.mbee.mdk.generator.graphs; \ No newline at end of file +package org.openmbee.mdk.generator.graphs; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/http/HttpDeleteWithBody.java b/src/main/java/org/openmbee/mdk/http/HttpDeleteWithBody.java similarity index 93% rename from src/main/java/gov/nasa/jpl/mbee/mdk/http/HttpDeleteWithBody.java rename to src/main/java/org/openmbee/mdk/http/HttpDeleteWithBody.java index d9904fc05..91d4bef56 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/http/HttpDeleteWithBody.java +++ b/src/main/java/org/openmbee/mdk/http/HttpDeleteWithBody.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.http; +package org.openmbee.mdk.http; import org.apache.http.annotation.NotThreadSafe; import org.apache.http.client.methods.HttpPost; @@ -24,4 +24,4 @@ public HttpDeleteWithBody(String uri) { public String getMethod() { return "DELETE"; } -} \ No newline at end of file +} diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/http/HttpGetWithBody.java b/src/main/java/org/openmbee/mdk/http/HttpGetWithBody.java similarity index 93% rename from src/main/java/gov/nasa/jpl/mbee/mdk/http/HttpGetWithBody.java rename to src/main/java/org/openmbee/mdk/http/HttpGetWithBody.java index e3c05fb45..1b30a2c82 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/http/HttpGetWithBody.java +++ b/src/main/java/org/openmbee/mdk/http/HttpGetWithBody.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.http; +package org.openmbee.mdk.http; import org.apache.http.annotation.NotThreadSafe; import org.apache.http.client.methods.HttpPost; @@ -25,4 +25,4 @@ public HttpGetWithBody(String uri) { public String getMethod() { return "GET"; } -} \ No newline at end of file +} diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/http/ServerException.java b/src/main/java/org/openmbee/mdk/http/ServerException.java similarity index 98% rename from src/main/java/gov/nasa/jpl/mbee/mdk/http/ServerException.java rename to src/main/java/org/openmbee/mdk/http/ServerException.java index a4cc9f48d..b6dfb1861 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/http/ServerException.java +++ b/src/main/java/org/openmbee/mdk/http/ServerException.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.http; +package org.openmbee.mdk.http; import org.apache.commons.text.WordUtils; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/json/ImportException.java b/src/main/java/org/openmbee/mdk/json/ImportException.java similarity index 96% rename from src/main/java/gov/nasa/jpl/mbee/mdk/json/ImportException.java rename to src/main/java/org/openmbee/mdk/json/ImportException.java index f87f422db..8e24c74dd 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/json/ImportException.java +++ b/src/main/java/org/openmbee/mdk/json/ImportException.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.json; +package org.openmbee.mdk.json; import com.fasterxml.jackson.databind.JsonNode; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/json/JacksonUtils.java b/src/main/java/org/openmbee/mdk/json/JacksonUtils.java similarity index 97% rename from src/main/java/gov/nasa/jpl/mbee/mdk/json/JacksonUtils.java rename to src/main/java/org/openmbee/mdk/json/JacksonUtils.java index 1cca2acdf..2c5af9664 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/json/JacksonUtils.java +++ b/src/main/java/org/openmbee/mdk/json/JacksonUtils.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.json; +package org.openmbee.mdk.json; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonParser; @@ -8,10 +8,10 @@ import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.databind.node.NullNode; import com.fasterxml.jackson.databind.node.ObjectNode; -import gov.nasa.jpl.mbee.mdk.options.MDKEnvironmentOptionsGroup; -import gov.nasa.jpl.mbee.mdk.util.MDUtils; +import org.openmbee.mdk.options.MDKEnvironmentOptionsGroup; +import org.openmbee.mdk.util.MDUtils; import org.apache.commons.lang3.math.NumberUtils; -import gov.nasa.jpl.mbee.mdk.api.incubating.MDKConstants; +import org.openmbee.mdk.api.incubating.MDKConstants; import java.io.File; import java.io.IOException; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/json/ReferenceException.java b/src/main/java/org/openmbee/mdk/json/ReferenceException.java similarity index 89% rename from src/main/java/gov/nasa/jpl/mbee/mdk/json/ReferenceException.java rename to src/main/java/org/openmbee/mdk/json/ReferenceException.java index ad6b25fa8..4ba8113f7 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/json/ReferenceException.java +++ b/src/main/java/org/openmbee/mdk/json/ReferenceException.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.json; +package org.openmbee.mdk.json; import com.fasterxml.jackson.databind.node.ObjectNode; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/json/TempFileJsonFactory.java b/src/main/java/org/openmbee/mdk/json/TempFileJsonFactory.java similarity index 92% rename from src/main/java/gov/nasa/jpl/mbee/mdk/json/TempFileJsonFactory.java rename to src/main/java/org/openmbee/mdk/json/TempFileJsonFactory.java index 401bb0142..689d919c1 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/json/TempFileJsonFactory.java +++ b/src/main/java/org/openmbee/mdk/json/TempFileJsonFactory.java @@ -1,11 +1,11 @@ -package gov.nasa.jpl.mbee.mdk.json; +package org.openmbee.mdk.json; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.util.JsonParserDelegate; import com.fasterxml.jackson.databind.MappingJsonFactory; import com.fasterxml.jackson.databind.ObjectMapper; -import gov.nasa.jpl.mbee.mdk.options.MDKEnvironmentOptionsGroup; +import org.openmbee.mdk.options.MDKEnvironmentOptionsGroup; import java.io.File; import java.io.IOException; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/json/diff/ui/DiffView.java b/src/main/java/org/openmbee/mdk/json/diff/ui/DiffView.java similarity index 94% rename from src/main/java/gov/nasa/jpl/mbee/mdk/json/diff/ui/DiffView.java rename to src/main/java/org/openmbee/mdk/json/diff/ui/DiffView.java index 63dc124be..f0a5d83d3 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/json/diff/ui/DiffView.java +++ b/src/main/java/org/openmbee/mdk/json/diff/ui/DiffView.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.json.diff.ui; +package org.openmbee.mdk.json.diff.ui; import com.fasterxml.jackson.databind.JsonNode; import javafx.fxml.FXMLLoader; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/json/diff/ui/DiffViewController.java b/src/main/java/org/openmbee/mdk/json/diff/ui/DiffViewController.java similarity index 99% rename from src/main/java/gov/nasa/jpl/mbee/mdk/json/diff/ui/DiffViewController.java rename to src/main/java/org/openmbee/mdk/json/diff/ui/DiffViewController.java index f6af3fcde..e04bd357c 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/json/diff/ui/DiffViewController.java +++ b/src/main/java/org/openmbee/mdk/json/diff/ui/DiffViewController.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.json.diff.ui; +package org.openmbee.mdk.json.diff.ui; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.MissingNode; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/json/diff/ui/MDKDiffView.java b/src/main/java/org/openmbee/mdk/json/diff/ui/MDKDiffView.java similarity index 98% rename from src/main/java/gov/nasa/jpl/mbee/mdk/json/diff/ui/MDKDiffView.java rename to src/main/java/org/openmbee/mdk/json/diff/ui/MDKDiffView.java index 6c508e06d..6ee87e3a7 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/json/diff/ui/MDKDiffView.java +++ b/src/main/java/org/openmbee/mdk/json/diff/ui/MDKDiffView.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.json.diff.ui; +package org.openmbee.mdk.json.diff.ui; import com.fasterxml.jackson.databind.JsonNode; import com.nomagic.magicdraw.core.Application; @@ -8,7 +8,7 @@ import com.nomagic.ui.ResizableIcon; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.NamedElement; -import gov.nasa.jpl.mbee.mdk.api.incubating.convert.Converters; +import org.openmbee.mdk.api.incubating.convert.Converters; import javafx.application.Platform; import javafx.embed.swing.SwingFXUtils; import javafx.scene.Scene; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/migrate/actions/GroupsMigrationAction.java b/src/main/java/org/openmbee/mdk/migrate/actions/GroupsMigrationAction.java similarity index 98% rename from src/main/java/gov/nasa/jpl/mbee/mdk/migrate/actions/GroupsMigrationAction.java rename to src/main/java/org/openmbee/mdk/migrate/actions/GroupsMigrationAction.java index 227ea5887..fd17c1099 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/migrate/actions/GroupsMigrationAction.java +++ b/src/main/java/org/openmbee/mdk/migrate/actions/GroupsMigrationAction.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.migrate.actions; +package org.openmbee.mdk.migrate.actions; import com.nomagic.magicdraw.actions.MDAction; import com.nomagic.magicdraw.core.Application; @@ -14,7 +14,7 @@ import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Generalization; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Package; import com.nomagic.uml2.ext.magicdraw.mdprofiles.Stereotype; -import gov.nasa.jpl.mbee.mdk.api.incubating.convert.Converters; +import org.openmbee.mdk.api.incubating.convert.Converters; import javax.annotation.CheckForNull; import java.awt.event.ActionEvent; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/MMSArtifact.java b/src/main/java/org/openmbee/mdk/mms/MMSArtifact.java similarity index 90% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/MMSArtifact.java rename to src/main/java/org/openmbee/mdk/mms/MMSArtifact.java index f388fe0d8..a294c2fd7 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/MMSArtifact.java +++ b/src/main/java/org/openmbee/mdk/mms/MMSArtifact.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.mms; +package org.openmbee.mdk.mms; import org.apache.http.entity.ContentType; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/MMSUtils.java b/src/main/java/org/openmbee/mdk/mms/MMSUtils.java similarity index 97% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/MMSUtils.java rename to src/main/java/org/openmbee/mdk/mms/MMSUtils.java index 8b35f3cc9..f17c51324 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/MMSUtils.java +++ b/src/main/java/org/openmbee/mdk/mms/MMSUtils.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.mms; +package org.openmbee.mdk.mms; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -8,17 +8,16 @@ import com.nomagic.magicdraw.core.Application; import com.nomagic.magicdraw.core.Project; import com.nomagic.task.ProgressStatus; -import gov.nasa.jpl.mbee.mdk.MDKPlugin; -import gov.nasa.jpl.mbee.mdk.api.incubating.MDKConstants; -import gov.nasa.jpl.mbee.mdk.api.incubating.convert.Converters; -import gov.nasa.jpl.mbee.mdk.http.ServerException; -import gov.nasa.jpl.mbee.mdk.json.JacksonUtils; -import gov.nasa.jpl.mbee.mdk.mms.actions.MMSLogoutAction; -import gov.nasa.jpl.mbee.mdk.mms.endpoints.*; -import gov.nasa.jpl.mbee.mdk.options.MDKEnvironmentOptionsGroup; -import gov.nasa.jpl.mbee.mdk.options.MDKProjectOptions; -import gov.nasa.jpl.mbee.mdk.util.MDUtils; -import gov.nasa.jpl.mbee.mdk.util.TaskRunner; +import org.openmbee.mdk.MDKPlugin; +import org.openmbee.mdk.api.incubating.MDKConstants; +import org.openmbee.mdk.api.incubating.convert.Converters; +import org.openmbee.mdk.http.ServerException; +import org.openmbee.mdk.json.JacksonUtils; +import org.openmbee.mdk.mms.actions.MMSLogoutAction; +import org.openmbee.mdk.options.MDKEnvironmentOptionsGroup; +import org.openmbee.mdk.options.MDKProjectOptions; +import org.openmbee.mdk.util.MDUtils; +import org.openmbee.mdk.util.TaskRunner; import org.apache.commons.io.IOUtils; import org.apache.http.HttpEntity; import org.apache.http.client.methods.CloseableHttpResponse; @@ -27,6 +26,7 @@ import org.apache.http.entity.ContentType; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; +import org.openmbee.mdk.mms.endpoints.*; import java.io.*; import java.net.HttpURLConnection; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/CommitBranchAction.java b/src/main/java/org/openmbee/mdk/mms/actions/CommitBranchAction.java similarity index 95% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/CommitBranchAction.java rename to src/main/java/org/openmbee/mdk/mms/actions/CommitBranchAction.java index 5cbbee3e1..e3a8ff496 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/CommitBranchAction.java +++ b/src/main/java/org/openmbee/mdk/mms/actions/CommitBranchAction.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.mms.actions; +package org.openmbee.mdk.mms.actions; /** * Created by ablack on 3/16/17. @@ -19,18 +19,20 @@ import com.nomagic.task.ProgressStatus; import com.nomagic.task.RunnableWithProgress; import com.nomagic.ui.ProgressStatusRunner; -import gov.nasa.jpl.mbee.mdk.api.incubating.MDKConstants; -import gov.nasa.jpl.mbee.mdk.api.incubating.convert.Converters; -import gov.nasa.jpl.mbee.mdk.http.ServerException; -import gov.nasa.jpl.mbee.mdk.json.JacksonUtils; -import gov.nasa.jpl.mbee.mdk.mms.MMSUtils; -import gov.nasa.jpl.mbee.mdk.mms.endpoints.*; -import gov.nasa.jpl.mbee.mdk.mms.sync.manual.ManualSyncRunner; -import gov.nasa.jpl.mbee.mdk.mms.validation.BranchValidator; -import gov.nasa.jpl.mbee.mdk.validation.IRuleViolationAction; -import gov.nasa.jpl.mbee.mdk.validation.RuleViolationAction; +import org.openmbee.mdk.api.incubating.MDKConstants; +import org.openmbee.mdk.api.incubating.convert.Converters; +import org.openmbee.mdk.http.ServerException; +import org.openmbee.mdk.json.JacksonUtils; +import org.openmbee.mdk.mms.MMSUtils; +import org.openmbee.mdk.mms.endpoints.MMSEndpointBuilderConstants; +import org.openmbee.mdk.mms.endpoints.MMSRefEndpoint; +import org.openmbee.mdk.mms.sync.manual.ManualSyncRunner; +import org.openmbee.mdk.mms.validation.BranchValidator; +import org.openmbee.mdk.validation.IRuleViolationAction; +import org.openmbee.mdk.validation.RuleViolationAction; import org.apache.http.client.methods.HttpRequestBase; import org.apache.http.entity.ContentType; +import org.openmbee.mdk.mms.endpoints.MMSRefsEndpoint; import java.awt.event.ActionEvent; import java.io.File; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/CommitClientElementAction.java b/src/main/java/org/openmbee/mdk/mms/actions/CommitClientElementAction.java similarity index 93% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/CommitClientElementAction.java rename to src/main/java/org/openmbee/mdk/mms/actions/CommitClientElementAction.java index 2f100ee85..6f2f217de 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/CommitClientElementAction.java +++ b/src/main/java/org/openmbee/mdk/mms/actions/CommitClientElementAction.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.mms.actions; +package org.openmbee.mdk.mms.actions; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.node.ObjectNode; @@ -8,16 +8,16 @@ import com.nomagic.magicdraw.core.Application; import com.nomagic.magicdraw.core.Project; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; -import gov.nasa.jpl.mbee.mdk.api.incubating.MDKConstants; -import gov.nasa.jpl.mbee.mdk.api.incubating.convert.Converters; -import gov.nasa.jpl.mbee.mdk.http.ServerException; -import gov.nasa.jpl.mbee.mdk.mms.MMSUtils; -import gov.nasa.jpl.mbee.mdk.mms.endpoints.MMSElementsEndpoint; -import gov.nasa.jpl.mbee.mdk.mms.endpoints.MMSEndpointBuilderConstants; -import gov.nasa.jpl.mbee.mdk.util.MDUtils; -import gov.nasa.jpl.mbee.mdk.util.TaskRunner; -import gov.nasa.jpl.mbee.mdk.validation.IRuleViolationAction; -import gov.nasa.jpl.mbee.mdk.validation.RuleViolationAction; +import org.openmbee.mdk.api.incubating.MDKConstants; +import org.openmbee.mdk.api.incubating.convert.Converters; +import org.openmbee.mdk.http.ServerException; +import org.openmbee.mdk.mms.MMSUtils; +import org.openmbee.mdk.mms.endpoints.MMSElementsEndpoint; +import org.openmbee.mdk.mms.endpoints.MMSEndpointBuilderConstants; +import org.openmbee.mdk.util.MDUtils; +import org.openmbee.mdk.util.TaskRunner; +import org.openmbee.mdk.validation.IRuleViolationAction; +import org.openmbee.mdk.validation.RuleViolationAction; import org.apache.http.client.methods.HttpRequestBase; import org.apache.http.entity.ContentType; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/CommitDiagramArtifactsAction.java b/src/main/java/org/openmbee/mdk/mms/actions/CommitDiagramArtifactsAction.java similarity index 84% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/CommitDiagramArtifactsAction.java rename to src/main/java/org/openmbee/mdk/mms/actions/CommitDiagramArtifactsAction.java index 9d5344ba8..144261af8 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/CommitDiagramArtifactsAction.java +++ b/src/main/java/org/openmbee/mdk/mms/actions/CommitDiagramArtifactsAction.java @@ -1,24 +1,23 @@ -package gov.nasa.jpl.mbee.mdk.mms.actions; +package org.openmbee.mdk.mms.actions; import com.nomagic.magicdraw.annotation.Annotation; import com.nomagic.magicdraw.annotation.AnnotationAction; import com.nomagic.magicdraw.core.Application; import com.nomagic.magicdraw.core.Project; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Diagram; -import gov.nasa.jpl.mbee.mdk.api.incubating.convert.Converters; -import gov.nasa.jpl.mbee.mdk.http.ServerException; -import gov.nasa.jpl.mbee.mdk.mms.MMSArtifact; -import gov.nasa.jpl.mbee.mdk.mms.MMSUtils; -import gov.nasa.jpl.mbee.mdk.mms.endpoints.MMSElementEndpoint; -import gov.nasa.jpl.mbee.mdk.mms.endpoints.MMSEndpointBuilderConstants; -import gov.nasa.jpl.mbee.mdk.util.MDUtils; -import gov.nasa.jpl.mbee.mdk.util.TaskRunner; -import gov.nasa.jpl.mbee.mdk.validation.IRuleViolationAction; -import gov.nasa.jpl.mbee.mdk.validation.RuleViolationAction; +import org.openmbee.mdk.api.incubating.convert.Converters; +import org.openmbee.mdk.http.ServerException; +import org.openmbee.mdk.mms.MMSArtifact; +import org.openmbee.mdk.mms.MMSUtils; +import org.openmbee.mdk.mms.endpoints.MMSElementEndpoint; +import org.openmbee.mdk.mms.endpoints.MMSEndpointBuilderConstants; +import org.openmbee.mdk.util.MDUtils; +import org.openmbee.mdk.util.TaskRunner; +import org.openmbee.mdk.validation.IRuleViolationAction; +import org.openmbee.mdk.validation.RuleViolationAction; import org.apache.http.HttpEntity; import org.apache.http.client.methods.HttpRequestBase; import org.apache.http.entity.mime.MultipartEntityBuilder; -import org.apache.http.entity.mime.content.InputStreamBody; import javax.annotation.CheckForNull; import java.awt.event.ActionEvent; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/CommitOrgAction.java b/src/main/java/org/openmbee/mdk/mms/actions/CommitOrgAction.java similarity index 90% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/CommitOrgAction.java rename to src/main/java/org/openmbee/mdk/mms/actions/CommitOrgAction.java index 51d2044d2..6cb3518aa 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/CommitOrgAction.java +++ b/src/main/java/org/openmbee/mdk/mms/actions/CommitOrgAction.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.mms.actions; +package org.openmbee.mdk.mms.actions; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.JsonNode; @@ -7,16 +7,14 @@ import com.nomagic.magicdraw.annotation.AnnotationAction; import com.nomagic.magicdraw.core.Application; import com.nomagic.magicdraw.core.Project; -import gov.nasa.jpl.mbee.mdk.api.incubating.MDKConstants; -import gov.nasa.jpl.mbee.mdk.http.ServerException; -import gov.nasa.jpl.mbee.mdk.json.JacksonUtils; -import gov.nasa.jpl.mbee.mdk.mms.MMSUtils; -import gov.nasa.jpl.mbee.mdk.mms.endpoints.MMSEndpoint; -import gov.nasa.jpl.mbee.mdk.mms.endpoints.MMSOrgsEndpoint; -import gov.nasa.jpl.mbee.mdk.validation.IRuleViolationAction; -import gov.nasa.jpl.mbee.mdk.validation.RuleViolationAction; +import org.openmbee.mdk.api.incubating.MDKConstants; +import org.openmbee.mdk.http.ServerException; +import org.openmbee.mdk.json.JacksonUtils; +import org.openmbee.mdk.mms.MMSUtils; +import org.openmbee.mdk.mms.endpoints.MMSOrgsEndpoint; +import org.openmbee.mdk.validation.IRuleViolationAction; +import org.openmbee.mdk.validation.RuleViolationAction; import org.apache.http.client.methods.HttpRequestBase; -import org.apache.http.client.utils.URIBuilder; import org.apache.http.entity.ContentType; import javax.swing.*; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/CommitProjectAction.java b/src/main/java/org/openmbee/mdk/mms/actions/CommitProjectAction.java similarity index 91% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/CommitProjectAction.java rename to src/main/java/org/openmbee/mdk/mms/actions/CommitProjectAction.java index e8e4e3ff1..6308ae358 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/CommitProjectAction.java +++ b/src/main/java/org/openmbee/mdk/mms/actions/CommitProjectAction.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.mms.actions; +package org.openmbee.mdk.mms.actions; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.JsonNode; @@ -10,19 +10,18 @@ import com.nomagic.magicdraw.core.ProjectUtilities; import com.nomagic.task.RunnableWithProgress; import com.nomagic.ui.ProgressStatusRunner; -import gov.nasa.jpl.mbee.mdk.api.incubating.MDKConstants; -import gov.nasa.jpl.mbee.mdk.api.incubating.convert.Converters; -import gov.nasa.jpl.mbee.mdk.http.ServerException; -import gov.nasa.jpl.mbee.mdk.json.JacksonUtils; -import gov.nasa.jpl.mbee.mdk.mms.MMSUtils; -import gov.nasa.jpl.mbee.mdk.mms.endpoints.MMSEndpoint; -import gov.nasa.jpl.mbee.mdk.mms.endpoints.MMSOrgsEndpoint; -import gov.nasa.jpl.mbee.mdk.mms.endpoints.MMSProjectsEndpoint; -import gov.nasa.jpl.mbee.mdk.mms.sync.manual.ManualSyncActionRunner; -import gov.nasa.jpl.mbee.mdk.mms.validation.ProjectValidator; -import gov.nasa.jpl.mbee.mdk.util.Pair; -import gov.nasa.jpl.mbee.mdk.validation.IRuleViolationAction; -import gov.nasa.jpl.mbee.mdk.validation.RuleViolationAction; +import org.openmbee.mdk.api.incubating.MDKConstants; +import org.openmbee.mdk.api.incubating.convert.Converters; +import org.openmbee.mdk.http.ServerException; +import org.openmbee.mdk.json.JacksonUtils; +import org.openmbee.mdk.mms.MMSUtils; +import org.openmbee.mdk.mms.endpoints.MMSOrgsEndpoint; +import org.openmbee.mdk.mms.endpoints.MMSProjectsEndpoint; +import org.openmbee.mdk.mms.sync.manual.ManualSyncActionRunner; +import org.openmbee.mdk.mms.validation.ProjectValidator; +import org.openmbee.mdk.util.Pair; +import org.openmbee.mdk.validation.IRuleViolationAction; +import org.openmbee.mdk.validation.RuleViolationAction; import org.apache.http.client.methods.HttpRequestBase; import org.apache.http.entity.ContentType; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/DetailedSyncStatusAction.java b/src/main/java/org/openmbee/mdk/mms/actions/DetailedSyncStatusAction.java similarity index 89% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/DetailedSyncStatusAction.java rename to src/main/java/org/openmbee/mdk/mms/actions/DetailedSyncStatusAction.java index 28d5aca2f..df0701b33 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/DetailedSyncStatusAction.java +++ b/src/main/java/org/openmbee/mdk/mms/actions/DetailedSyncStatusAction.java @@ -1,22 +1,22 @@ -package gov.nasa.jpl.mbee.mdk.mms.actions; +package org.openmbee.mdk.mms.actions; import com.nomagic.magicdraw.actions.MDAction; import com.nomagic.magicdraw.core.Application; import com.nomagic.magicdraw.core.Project; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; -import gov.nasa.jpl.mbee.mdk.actions.LockAction; -import gov.nasa.jpl.mbee.mdk.api.incubating.convert.Converters; -import gov.nasa.jpl.mbee.mdk.mms.sync.delta.SyncElement; -import gov.nasa.jpl.mbee.mdk.mms.sync.delta.SyncElements; -import gov.nasa.jpl.mbee.mdk.mms.sync.local.LocalDeltaProjectEventListenerAdapter; -import gov.nasa.jpl.mbee.mdk.mms.sync.local.LocalDeltaTransactionCommitListener; -import gov.nasa.jpl.mbee.mdk.mms.sync.mms.MMSDeltaProjectEventListenerAdapter; -import gov.nasa.jpl.mbee.mdk.util.Changelog; -import gov.nasa.jpl.mbee.mdk.util.Utils; -import gov.nasa.jpl.mbee.mdk.validation.ValidationRule; -import gov.nasa.jpl.mbee.mdk.validation.ValidationRuleViolation; -import gov.nasa.jpl.mbee.mdk.validation.ValidationSuite; -import gov.nasa.jpl.mbee.mdk.validation.ViolationSeverity; +import org.openmbee.mdk.actions.LockAction; +import org.openmbee.mdk.api.incubating.convert.Converters; +import org.openmbee.mdk.mms.sync.delta.SyncElement; +import org.openmbee.mdk.mms.sync.delta.SyncElements; +import org.openmbee.mdk.mms.sync.local.LocalDeltaProjectEventListenerAdapter; +import org.openmbee.mdk.mms.sync.local.LocalDeltaTransactionCommitListener; +import org.openmbee.mdk.mms.sync.mms.MMSDeltaProjectEventListenerAdapter; +import org.openmbee.mdk.util.Changelog; +import org.openmbee.mdk.util.Utils; +import org.openmbee.mdk.validation.ValidationRule; +import org.openmbee.mdk.validation.ValidationRuleViolation; +import org.openmbee.mdk.validation.ValidationSuite; +import org.openmbee.mdk.validation.ViolationSeverity; import javax.annotation.CheckForNull; import java.awt.event.ActionEvent; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/ElementDiffAction.java b/src/main/java/org/openmbee/mdk/mms/actions/ElementDiffAction.java similarity index 91% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/ElementDiffAction.java rename to src/main/java/org/openmbee/mdk/mms/actions/ElementDiffAction.java index a5296245f..c712400c6 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/ElementDiffAction.java +++ b/src/main/java/org/openmbee/mdk/mms/actions/ElementDiffAction.java @@ -1,10 +1,10 @@ -package gov.nasa.jpl.mbee.mdk.mms.actions; +package org.openmbee.mdk.mms.actions; import com.fasterxml.jackson.databind.JsonNode; import com.nomagic.magicdraw.actions.MDAction; import com.nomagic.magicdraw.core.Application; import com.nomagic.magicdraw.core.Project; -import gov.nasa.jpl.mbee.mdk.MDKPlugin; +import org.openmbee.mdk.MDKPlugin; import javax.annotation.CheckForNull; import javax.swing.*; @@ -32,7 +32,7 @@ public void actionPerformed(@CheckForNull ActionEvent actionEvent) { return; } try { - Class clazz = Class.forName("gov.nasa.jpl.mbee.mdk.json.diff.ui.MDKDiffView"); + Class clazz = Class.forName("org.openmbee.mdk.json.diff.ui.MDKDiffView"); Constructor constructor = clazz.getConstructor(JsonNode.class, JsonNode.class, JsonNode.class, Project.class); Runnable runnable = (Runnable) constructor.newInstance(clientElement, serverElement, patch, project); runnable.run(); diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/GenerateAllViewsAction.java b/src/main/java/org/openmbee/mdk/mms/actions/GenerateAllViewsAction.java similarity index 91% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/GenerateAllViewsAction.java rename to src/main/java/org/openmbee/mdk/mms/actions/GenerateAllViewsAction.java index 63289496c..7109049a7 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/GenerateAllViewsAction.java +++ b/src/main/java/org/openmbee/mdk/mms/actions/GenerateAllViewsAction.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.mms.actions; +package org.openmbee.mdk.mms.actions; import com.nomagic.magicdraw.core.Application; import com.nomagic.magicdraw.core.Project; @@ -8,9 +8,9 @@ import com.nomagic.uml2.ext.jmi.helpers.StereotypesHelper; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; import com.nomagic.uml2.ext.magicdraw.mdprofiles.Stereotype; -import gov.nasa.jpl.mbee.mdk.generator.ViewPresentationGenerator; -import gov.nasa.jpl.mbee.mdk.util.Utils; -import gov.nasa.jpl.mbee.mdk.validation.ValidationSuite; +import org.openmbee.mdk.generator.ViewPresentationGenerator; +import org.openmbee.mdk.util.Utils; +import org.openmbee.mdk.validation.ValidationSuite; import java.awt.event.ActionEvent; import java.util.ArrayList; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/GenerateDocBookAction.java b/src/main/java/org/openmbee/mdk/mms/actions/GenerateDocBookAction.java similarity index 88% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/GenerateDocBookAction.java rename to src/main/java/org/openmbee/mdk/mms/actions/GenerateDocBookAction.java index 67fd75776..563bce5cb 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/GenerateDocBookAction.java +++ b/src/main/java/org/openmbee/mdk/mms/actions/GenerateDocBookAction.java @@ -1,9 +1,9 @@ -package gov.nasa.jpl.mbee.mdk.mms.actions; +package org.openmbee.mdk.mms.actions; import com.nomagic.ui.ProgressStatusRunner; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; -import gov.nasa.jpl.mbee.mdk.generator.DocumentWriter; -import gov.nasa.jpl.mbee.mdk.model.Document; +import org.openmbee.mdk.generator.DocumentWriter; +import org.openmbee.mdk.model.Document; import java.awt.event.ActionEvent; import java.io.File; @@ -37,6 +37,6 @@ protected void generate(File outputDocbookFile) { ProgressStatusRunner.runWithProgressStatus(new DocumentWriter(doc, outputDocbookFile, doc.getGenNewImage()), "DocGen", true, 0); } } - + } diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/GeneratePdfAction.java b/src/main/java/org/openmbee/mdk/mms/actions/GeneratePdfAction.java similarity index 93% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/GeneratePdfAction.java rename to src/main/java/org/openmbee/mdk/mms/actions/GeneratePdfAction.java index 7e02a2d37..f6ed18525 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/GeneratePdfAction.java +++ b/src/main/java/org/openmbee/mdk/mms/actions/GeneratePdfAction.java @@ -1,19 +1,19 @@ -package gov.nasa.jpl.mbee.mdk.mms.actions; +package org.openmbee.mdk.mms.actions; import com.nomagic.magicdraw.actions.MDAction; import com.nomagic.magicdraw.core.Application; import com.nomagic.magicdraw.core.Project; import com.nomagic.ui.ProgressStatusRunner; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; -import gov.nasa.jpl.mbee.mdk.MDKPlugin; -import gov.nasa.jpl.mbee.mdk.api.incubating.convert.Converters; -import gov.nasa.jpl.mbee.mdk.docgen.ViewViewpointValidator; -import gov.nasa.jpl.mbee.mdk.generator.PdfWriter; -import gov.nasa.jpl.mbee.mdk.generator.DocumentGenerator; -import gov.nasa.jpl.mbee.mdk.generator.PostProcessor; -import gov.nasa.jpl.mbee.mdk.model.Document; -import gov.nasa.jpl.mbee.mdk.options.MDKEnvironmentOptionsGroup; -import gov.nasa.jpl.mbee.mdk.util.Utils; +import org.openmbee.mdk.MDKPlugin; +import org.openmbee.mdk.api.incubating.convert.Converters; +import org.openmbee.mdk.docgen.ViewViewpointValidator; +import org.openmbee.mdk.generator.PdfWriter; +import org.openmbee.mdk.generator.DocumentGenerator; +import org.openmbee.mdk.generator.PostProcessor; +import org.openmbee.mdk.model.Document; +import org.openmbee.mdk.options.MDKEnvironmentOptionsGroup; +import org.openmbee.mdk.util.Utils; import org.apache.commons.lang3.exception.ExceptionUtils; import javax.swing.*; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/GeneratePdfFromDocBookAction.java b/src/main/java/org/openmbee/mdk/mms/actions/GeneratePdfFromDocBookAction.java similarity index 95% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/GeneratePdfFromDocBookAction.java rename to src/main/java/org/openmbee/mdk/mms/actions/GeneratePdfFromDocBookAction.java index d74aa0ed2..e70e77a59 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/GeneratePdfFromDocBookAction.java +++ b/src/main/java/org/openmbee/mdk/mms/actions/GeneratePdfFromDocBookAction.java @@ -1,8 +1,8 @@ -package gov.nasa.jpl.mbee.mdk.mms.actions; +package org.openmbee.mdk.mms.actions; import com.nomagic.ui.ProgressStatusRunner; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; -import gov.nasa.jpl.mbee.mdk.generator.Document2PdfWriter; +import org.openmbee.mdk.generator.Document2PdfWriter; import javax.swing.filechooser.FileNameExtensionFilter; import java.awt.event.ActionEvent; @@ -48,7 +48,7 @@ public void actionPerformed(ActionEvent e) { } } } - + protected File askForDocBookFile(String title, String buttonText) { File docbookFile = fileSelect(title, new File(docBookDefaultDir, view.getHumanName().substring(view.getHumanType().length()).trim() + ".xml"), buttonText, new FileNameExtensionFilter("XML", "xml")); if (docbookFile == null) return null; //cancelled diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/GenerateViewPresentationAction.java b/src/main/java/org/openmbee/mdk/mms/actions/GenerateViewPresentationAction.java similarity index 92% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/GenerateViewPresentationAction.java rename to src/main/java/org/openmbee/mdk/mms/actions/GenerateViewPresentationAction.java index 920b96d40..e01222bbe 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/GenerateViewPresentationAction.java +++ b/src/main/java/org/openmbee/mdk/mms/actions/GenerateViewPresentationAction.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.mms.actions; +package org.openmbee.mdk.mms.actions; import com.nomagic.magicdraw.core.Application; import com.nomagic.magicdraw.core.Project; @@ -7,10 +7,10 @@ import com.nomagic.uml2.ext.jmi.helpers.StereotypesHelper; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; import com.nomagic.uml2.ext.magicdraw.mdprofiles.Stereotype; -import gov.nasa.jpl.mbee.mdk.api.incubating.convert.Converters; -import gov.nasa.jpl.mbee.mdk.generator.ViewPresentationGenerator; -import gov.nasa.jpl.mbee.mdk.util.Utils; -import gov.nasa.jpl.mbee.mdk.validation.ValidationSuite; +import org.openmbee.mdk.api.incubating.convert.Converters; +import org.openmbee.mdk.generator.ViewPresentationGenerator; +import org.openmbee.mdk.util.Utils; +import org.openmbee.mdk.validation.ValidationSuite; import java.awt.event.ActionEvent; import java.util.*; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/MMSAction.java b/src/main/java/org/openmbee/mdk/mms/actions/MMSAction.java similarity index 88% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/MMSAction.java rename to src/main/java/org/openmbee/mdk/mms/actions/MMSAction.java index cde7d6f15..9108ce1b0 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/MMSAction.java +++ b/src/main/java/org/openmbee/mdk/mms/actions/MMSAction.java @@ -1,8 +1,8 @@ -package gov.nasa.jpl.mbee.mdk.mms.actions; +package org.openmbee.mdk.mms.actions; import com.nomagic.magicdraw.actions.MDAction; import com.nomagic.magicdraw.core.Application; -import gov.nasa.jpl.mbee.mdk.util.TicketUtils; +import org.openmbee.mdk.util.TicketUtils; import javax.swing.*; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/MMSLoginAction.java b/src/main/java/org/openmbee/mdk/mms/actions/MMSLoginAction.java similarity index 85% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/MMSLoginAction.java rename to src/main/java/org/openmbee/mdk/mms/actions/MMSLoginAction.java index 610ba5ec6..3e9149795 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/MMSLoginAction.java +++ b/src/main/java/org/openmbee/mdk/mms/actions/MMSLoginAction.java @@ -1,14 +1,14 @@ -package gov.nasa.jpl.mbee.mdk.mms.actions; +package org.openmbee.mdk.mms.actions; import com.nomagic.magicdraw.actions.ActionsStateUpdater; import com.nomagic.magicdraw.actions.MDAction; import com.nomagic.magicdraw.core.Application; import com.nomagic.magicdraw.core.Project; -import gov.nasa.jpl.mbee.mdk.http.ServerException; -import gov.nasa.jpl.mbee.mdk.mms.sync.mms.MMSDeltaProjectEventListenerAdapter; -import gov.nasa.jpl.mbee.mdk.tickets.AcquireTicketChain; -import gov.nasa.jpl.mbee.mdk.util.TaskRunner; -import gov.nasa.jpl.mbee.mdk.util.Utils; +import org.openmbee.mdk.http.ServerException; +import org.openmbee.mdk.mms.sync.mms.MMSDeltaProjectEventListenerAdapter; +import org.openmbee.mdk.tickets.AcquireTicketChain; +import org.openmbee.mdk.util.TaskRunner; +import org.openmbee.mdk.util.Utils; import java.awt.event.ActionEvent; import java.io.IOException; @@ -38,7 +38,7 @@ public static boolean loginAction(Project project) { Utils.showPopupMessage("Please login in to Teamwork Cloud before logging in to MMS."); return false; } - */ + */ AcquireTicketChain ticketChain = new AcquireTicketChain(); if (!ticketChain.acquireMmsTicket(project)) { return false; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/MMSLogoutAction.java b/src/main/java/org/openmbee/mdk/mms/actions/MMSLogoutAction.java similarity index 86% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/MMSLogoutAction.java rename to src/main/java/org/openmbee/mdk/mms/actions/MMSLogoutAction.java index e7968dab1..af9be4f15 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/MMSLogoutAction.java +++ b/src/main/java/org/openmbee/mdk/mms/actions/MMSLogoutAction.java @@ -1,11 +1,11 @@ -package gov.nasa.jpl.mbee.mdk.mms.actions; +package org.openmbee.mdk.mms.actions; import com.nomagic.magicdraw.actions.ActionsStateUpdater; import com.nomagic.magicdraw.actions.MDAction; import com.nomagic.magicdraw.core.Application; import com.nomagic.magicdraw.core.Project; -import gov.nasa.jpl.mbee.mdk.mms.sync.status.SyncStatusConfigurator; -import gov.nasa.jpl.mbee.mdk.util.TicketUtils; +import org.openmbee.mdk.mms.sync.status.SyncStatusConfigurator; +import org.openmbee.mdk.util.TicketUtils; import java.awt.event.ActionEvent; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/UpdateClientElementAction.java b/src/main/java/org/openmbee/mdk/mms/actions/UpdateClientElementAction.java similarity index 96% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/UpdateClientElementAction.java rename to src/main/java/org/openmbee/mdk/mms/actions/UpdateClientElementAction.java index 90560385a..d6c1023d0 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/UpdateClientElementAction.java +++ b/src/main/java/org/openmbee/mdk/mms/actions/UpdateClientElementAction.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.mms.actions; +package org.openmbee.mdk.mms.actions; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; @@ -19,20 +19,20 @@ import com.nomagic.task.RunnableWithProgress; import com.nomagic.ui.ProgressStatusRunner; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; -import gov.nasa.jpl.mbee.mdk.actions.ClipboardAction; -import gov.nasa.jpl.mbee.mdk.actions.LockAction; -import gov.nasa.jpl.mbee.mdk.api.incubating.MDKConstants; -import gov.nasa.jpl.mbee.mdk.api.incubating.convert.Converters; -import gov.nasa.jpl.mbee.mdk.emf.EMFBulkImporter; -import gov.nasa.jpl.mbee.mdk.json.JacksonUtils; -import gov.nasa.jpl.mbee.mdk.mms.json.JsonPatchFunction; -import gov.nasa.jpl.mbee.mdk.mms.sync.delta.SyncElement; -import gov.nasa.jpl.mbee.mdk.mms.sync.local.LocalDeltaProjectEventListenerAdapter; -import gov.nasa.jpl.mbee.mdk.mms.sync.local.LocalDeltaTransactionCommitListener; -import gov.nasa.jpl.mbee.mdk.util.Changelog; -import gov.nasa.jpl.mbee.mdk.util.Pair; -import gov.nasa.jpl.mbee.mdk.util.Utils; -import gov.nasa.jpl.mbee.mdk.validation.*; +import org.openmbee.mdk.actions.ClipboardAction; +import org.openmbee.mdk.actions.LockAction; +import org.openmbee.mdk.api.incubating.MDKConstants; +import org.openmbee.mdk.api.incubating.convert.Converters; +import org.openmbee.mdk.emf.EMFBulkImporter; +import org.openmbee.mdk.json.JacksonUtils; +import org.openmbee.mdk.mms.json.JsonPatchFunction; +import org.openmbee.mdk.mms.sync.delta.SyncElement; +import org.openmbee.mdk.mms.sync.local.LocalDeltaProjectEventListenerAdapter; +import org.openmbee.mdk.mms.sync.local.LocalDeltaTransactionCommitListener; +import org.openmbee.mdk.util.Changelog; +import org.openmbee.mdk.util.Pair; +import org.openmbee.mdk.util.Utils; +import org.openmbee.mdk.validation.*; import javax.annotation.CheckForNull; import java.awt.event.ActionEvent; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/ValidateBranchesAction.java b/src/main/java/org/openmbee/mdk/mms/actions/ValidateBranchesAction.java similarity index 89% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/ValidateBranchesAction.java rename to src/main/java/org/openmbee/mdk/mms/actions/ValidateBranchesAction.java index 41400e40b..d2e1cbc78 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/ValidateBranchesAction.java +++ b/src/main/java/org/openmbee/mdk/mms/actions/ValidateBranchesAction.java @@ -1,11 +1,11 @@ -package gov.nasa.jpl.mbee.mdk.mms.actions; +package org.openmbee.mdk.mms.actions; import com.nomagic.magicdraw.core.Application; import com.nomagic.task.ProgressStatus; import com.nomagic.task.RunnableWithProgress; import com.nomagic.ui.ProgressStatusRunner; -import gov.nasa.jpl.mbee.mdk.mms.validation.BranchValidator; -import gov.nasa.jpl.mbee.mdk.util.TicketUtils; +import org.openmbee.mdk.mms.validation.BranchValidator; +import org.openmbee.mdk.util.TicketUtils; import java.awt.event.ActionEvent; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/ValidateElementAction.java b/src/main/java/org/openmbee/mdk/mms/actions/ValidateElementAction.java similarity index 89% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/ValidateElementAction.java rename to src/main/java/org/openmbee/mdk/mms/actions/ValidateElementAction.java index fbf21708c..96e3515ab 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/ValidateElementAction.java +++ b/src/main/java/org/openmbee/mdk/mms/actions/ValidateElementAction.java @@ -1,11 +1,11 @@ -package gov.nasa.jpl.mbee.mdk.mms.actions; +package org.openmbee.mdk.mms.actions; import com.nomagic.magicdraw.core.Application; import com.nomagic.magicdraw.core.Project; import com.nomagic.ui.ProgressStatusRunner; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; -import gov.nasa.jpl.mbee.mdk.mms.sync.manual.ManualSyncRunner; -import gov.nasa.jpl.mbee.mdk.util.Utils; +import org.openmbee.mdk.mms.sync.manual.ManualSyncRunner; +import org.openmbee.mdk.util.Utils; import java.awt.event.ActionEvent; import java.util.Collection; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/ValidateElementRecursivelyAction.java b/src/main/java/org/openmbee/mdk/mms/actions/ValidateElementRecursivelyAction.java similarity index 89% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/ValidateElementRecursivelyAction.java rename to src/main/java/org/openmbee/mdk/mms/actions/ValidateElementRecursivelyAction.java index 89d82f0f8..ed9fed827 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/ValidateElementRecursivelyAction.java +++ b/src/main/java/org/openmbee/mdk/mms/actions/ValidateElementRecursivelyAction.java @@ -1,11 +1,11 @@ -package gov.nasa.jpl.mbee.mdk.mms.actions; +package org.openmbee.mdk.mms.actions; import com.nomagic.magicdraw.core.Application; import com.nomagic.magicdraw.core.Project; import com.nomagic.ui.ProgressStatusRunner; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; -import gov.nasa.jpl.mbee.mdk.mms.sync.manual.ManualSyncRunner; -import gov.nasa.jpl.mbee.mdk.util.Utils; +import org.openmbee.mdk.mms.sync.manual.ManualSyncRunner; +import org.openmbee.mdk.util.Utils; import java.awt.event.ActionEvent; import java.util.Collection; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSCommitEndpoint.java b/src/main/java/org/openmbee/mdk/mms/endpoints/MMSCommitEndpoint.java similarity index 94% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSCommitEndpoint.java rename to src/main/java/org/openmbee/mdk/mms/endpoints/MMSCommitEndpoint.java index f7df7a2ed..6a5dd7bb6 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSCommitEndpoint.java +++ b/src/main/java/org/openmbee/mdk/mms/endpoints/MMSCommitEndpoint.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.mms.endpoints; +package org.openmbee.mdk.mms.endpoints; import java.net.URISyntaxException; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSCommitsEndpoint.java b/src/main/java/org/openmbee/mdk/mms/endpoints/MMSCommitsEndpoint.java similarity index 92% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSCommitsEndpoint.java rename to src/main/java/org/openmbee/mdk/mms/endpoints/MMSCommitsEndpoint.java index 491507e33..ba5663455 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSCommitsEndpoint.java +++ b/src/main/java/org/openmbee/mdk/mms/endpoints/MMSCommitsEndpoint.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.mms.endpoints; +package org.openmbee.mdk.mms.endpoints; import java.net.URISyntaxException; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSElementEndpoint.java b/src/main/java/org/openmbee/mdk/mms/endpoints/MMSElementEndpoint.java similarity index 94% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSElementEndpoint.java rename to src/main/java/org/openmbee/mdk/mms/endpoints/MMSElementEndpoint.java index 8d37e0656..e5361d980 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSElementEndpoint.java +++ b/src/main/java/org/openmbee/mdk/mms/endpoints/MMSElementEndpoint.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.mms.endpoints; +package org.openmbee.mdk.mms.endpoints; import java.net.URISyntaxException; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSElementsEndpoint.java b/src/main/java/org/openmbee/mdk/mms/endpoints/MMSElementsEndpoint.java similarity index 92% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSElementsEndpoint.java rename to src/main/java/org/openmbee/mdk/mms/endpoints/MMSElementsEndpoint.java index ed3014475..8891d8df5 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSElementsEndpoint.java +++ b/src/main/java/org/openmbee/mdk/mms/endpoints/MMSElementsEndpoint.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.mms.endpoints; +package org.openmbee.mdk.mms.endpoints; import java.net.URISyntaxException; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSEndpoint.java b/src/main/java/org/openmbee/mdk/mms/endpoints/MMSEndpoint.java similarity index 97% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSEndpoint.java rename to src/main/java/org/openmbee/mdk/mms/endpoints/MMSEndpoint.java index 662599303..052ae67e1 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSEndpoint.java +++ b/src/main/java/org/openmbee/mdk/mms/endpoints/MMSEndpoint.java @@ -1,9 +1,9 @@ -package gov.nasa.jpl.mbee.mdk.mms.endpoints; +package org.openmbee.mdk.mms.endpoints; import com.nomagic.magicdraw.core.Project; -import gov.nasa.jpl.mbee.mdk.http.HttpDeleteWithBody; -import gov.nasa.jpl.mbee.mdk.mms.MMSUtils; -import gov.nasa.jpl.mbee.mdk.util.TicketUtils; +import org.openmbee.mdk.http.HttpDeleteWithBody; +import org.openmbee.mdk.mms.MMSUtils; +import org.openmbee.mdk.util.TicketUtils; import org.apache.http.Consts; import org.apache.http.HttpEntity; import org.apache.http.HttpEntityEnclosingRequest; @@ -23,7 +23,7 @@ import java.util.HashMap; import java.util.Map; -import static gov.nasa.jpl.mbee.mdk.mms.MMSUtils.HttpRequestType.*; +import static org.openmbee.mdk.mms.MMSUtils.HttpRequestType.*; public abstract class MMSEndpoint { protected static URIBuilder uriBuilder; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSEndpointBuilderConstants.java b/src/main/java/org/openmbee/mdk/mms/endpoints/MMSEndpointBuilderConstants.java similarity index 95% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSEndpointBuilderConstants.java rename to src/main/java/org/openmbee/mdk/mms/endpoints/MMSEndpointBuilderConstants.java index 0a3169133..2c5decfb6 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSEndpointBuilderConstants.java +++ b/src/main/java/org/openmbee/mdk/mms/endpoints/MMSEndpointBuilderConstants.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.mms.endpoints; +package org.openmbee.mdk.mms.endpoints; public class MMSEndpointBuilderConstants { // core parameters diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSEndpointType.java b/src/main/java/org/openmbee/mdk/mms/endpoints/MMSEndpointType.java similarity index 95% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSEndpointType.java rename to src/main/java/org/openmbee/mdk/mms/endpoints/MMSEndpointType.java index 608c4655e..a411d60c4 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSEndpointType.java +++ b/src/main/java/org/openmbee/mdk/mms/endpoints/MMSEndpointType.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.mms.endpoints; +package org.openmbee.mdk.mms.endpoints; public enum MMSEndpointType { LOGIN("mmslogin", "/authentication"), diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSLoginEndpoint.java b/src/main/java/org/openmbee/mdk/mms/endpoints/MMSLoginEndpoint.java similarity index 93% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSLoginEndpoint.java rename to src/main/java/org/openmbee/mdk/mms/endpoints/MMSLoginEndpoint.java index 7f0b4f0cc..00f064f16 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSLoginEndpoint.java +++ b/src/main/java/org/openmbee/mdk/mms/endpoints/MMSLoginEndpoint.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.mms.endpoints; +package org.openmbee.mdk.mms.endpoints; import java.io.IOException; import java.net.URI; @@ -10,12 +10,11 @@ import org.apache.http.HttpEntityEnclosingRequest; import org.apache.http.client.methods.HttpPost; import org.apache.http.client.methods.HttpRequestBase; -import org.apache.http.client.utils.URIBuilder; import org.apache.http.entity.ContentType; import org.apache.http.entity.StringEntity; import org.apache.http.protocol.HTTP; -import gov.nasa.jpl.mbee.mdk.json.JacksonUtils; +import org.openmbee.mdk.json.JacksonUtils; public class MMSLoginEndpoint extends MMSEndpoint { public MMSLoginEndpoint(String baseUri) throws URISyntaxException { diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSOrgsEndpoint.java b/src/main/java/org/openmbee/mdk/mms/endpoints/MMSOrgsEndpoint.java similarity index 81% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSOrgsEndpoint.java rename to src/main/java/org/openmbee/mdk/mms/endpoints/MMSOrgsEndpoint.java index 517b26b65..4be443f01 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSOrgsEndpoint.java +++ b/src/main/java/org/openmbee/mdk/mms/endpoints/MMSOrgsEndpoint.java @@ -1,8 +1,5 @@ -package gov.nasa.jpl.mbee.mdk.mms.endpoints; +package org.openmbee.mdk.mms.endpoints; -import org.apache.http.client.methods.HttpRequestBase; - -import java.io.IOException; import java.net.URISyntaxException; public class MMSOrgsEndpoint extends MMSEndpoint { diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSProjectEndpoint.java b/src/main/java/org/openmbee/mdk/mms/endpoints/MMSProjectEndpoint.java similarity index 94% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSProjectEndpoint.java rename to src/main/java/org/openmbee/mdk/mms/endpoints/MMSProjectEndpoint.java index ce9354183..318ea0103 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSProjectEndpoint.java +++ b/src/main/java/org/openmbee/mdk/mms/endpoints/MMSProjectEndpoint.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.mms.endpoints; +package org.openmbee.mdk.mms.endpoints; import java.net.URISyntaxException; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSProjectsEndpoint.java b/src/main/java/org/openmbee/mdk/mms/endpoints/MMSProjectsEndpoint.java similarity index 93% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSProjectsEndpoint.java rename to src/main/java/org/openmbee/mdk/mms/endpoints/MMSProjectsEndpoint.java index 767e8a52b..2d970f94a 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSProjectsEndpoint.java +++ b/src/main/java/org/openmbee/mdk/mms/endpoints/MMSProjectsEndpoint.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.mms.endpoints; +package org.openmbee.mdk.mms.endpoints; import java.net.URISyntaxException; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSRefEndpoint.java b/src/main/java/org/openmbee/mdk/mms/endpoints/MMSRefEndpoint.java similarity index 93% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSRefEndpoint.java rename to src/main/java/org/openmbee/mdk/mms/endpoints/MMSRefEndpoint.java index fa84e5086..f94007e51 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSRefEndpoint.java +++ b/src/main/java/org/openmbee/mdk/mms/endpoints/MMSRefEndpoint.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.mms.endpoints; +package org.openmbee.mdk.mms.endpoints; import java.net.URISyntaxException; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSRefsEndpoint.java b/src/main/java/org/openmbee/mdk/mms/endpoints/MMSRefsEndpoint.java similarity index 92% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSRefsEndpoint.java rename to src/main/java/org/openmbee/mdk/mms/endpoints/MMSRefsEndpoint.java index dc47046fc..753024bc3 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSRefsEndpoint.java +++ b/src/main/java/org/openmbee/mdk/mms/endpoints/MMSRefsEndpoint.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.mms.endpoints; +package org.openmbee.mdk.mms.endpoints; import java.net.URISyntaxException; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSSearchEndpoint.java b/src/main/java/org/openmbee/mdk/mms/endpoints/MMSSearchEndpoint.java similarity index 92% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSSearchEndpoint.java rename to src/main/java/org/openmbee/mdk/mms/endpoints/MMSSearchEndpoint.java index fc2fb4e72..627a0ac1f 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSSearchEndpoint.java +++ b/src/main/java/org/openmbee/mdk/mms/endpoints/MMSSearchEndpoint.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.mms.endpoints; +package org.openmbee.mdk.mms.endpoints; import java.net.URISyntaxException; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSTWCLoginEndpoint.java b/src/main/java/org/openmbee/mdk/mms/endpoints/MMSTWCLoginEndpoint.java similarity index 93% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSTWCLoginEndpoint.java rename to src/main/java/org/openmbee/mdk/mms/endpoints/MMSTWCLoginEndpoint.java index 2527a54ee..2e92bfa95 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSTWCLoginEndpoint.java +++ b/src/main/java/org/openmbee/mdk/mms/endpoints/MMSTWCLoginEndpoint.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.mms.endpoints; +package org.openmbee.mdk.mms.endpoints; import java.io.IOException; import java.net.URI; @@ -7,7 +7,6 @@ import org.apache.http.Consts; import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpRequestBase; -import org.apache.http.client.utils.URIBuilder; public class MMSTWCLoginEndpoint extends MMSEndpoint { public MMSTWCLoginEndpoint(String baseUri) throws URISyntaxException { diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSValidateJwtToken.java b/src/main/java/org/openmbee/mdk/mms/endpoints/MMSValidateJwtToken.java similarity index 93% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSValidateJwtToken.java rename to src/main/java/org/openmbee/mdk/mms/endpoints/MMSValidateJwtToken.java index f0d560db8..3154b44b0 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSValidateJwtToken.java +++ b/src/main/java/org/openmbee/mdk/mms/endpoints/MMSValidateJwtToken.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.mms.endpoints; +package org.openmbee.mdk.mms.endpoints; import java.net.URISyntaxException; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/json/JsonEquivalencePredicate.java b/src/main/java/org/openmbee/mdk/mms/json/JsonEquivalencePredicate.java similarity index 95% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/json/JsonEquivalencePredicate.java rename to src/main/java/org/openmbee/mdk/mms/json/JsonEquivalencePredicate.java index ba72faa65..7d2016663 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/json/JsonEquivalencePredicate.java +++ b/src/main/java/org/openmbee/mdk/mms/json/JsonEquivalencePredicate.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.mms.json; +package org.openmbee.mdk.mms.json; import com.fasterxml.jackson.databind.JsonNode; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/json/JsonPatchFunction.java b/src/main/java/org/openmbee/mdk/mms/json/JsonPatchFunction.java similarity index 92% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/json/JsonPatchFunction.java rename to src/main/java/org/openmbee/mdk/mms/json/JsonPatchFunction.java index d3b09bbfd..9c2e2ec37 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/json/JsonPatchFunction.java +++ b/src/main/java/org/openmbee/mdk/mms/json/JsonPatchFunction.java @@ -1,10 +1,10 @@ -package gov.nasa.jpl.mbee.mdk.mms.json; +package org.openmbee.mdk.mms.json; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; import com.github.fge.jsonpatch.diff.JsonDiff; -import gov.nasa.jpl.mbee.mdk.api.incubating.MDKConstants; -import gov.nasa.jpl.mbee.mdk.json.JacksonUtils; +import org.openmbee.mdk.api.incubating.MDKConstants; +import org.openmbee.mdk.json.JacksonUtils; import java.util.Iterator; import java.util.function.BiFunction; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/sync/coordinated/CoordinatedSyncProjectEventListenerAdapter.java b/src/main/java/org/openmbee/mdk/mms/sync/coordinated/CoordinatedSyncProjectEventListenerAdapter.java similarity index 91% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/sync/coordinated/CoordinatedSyncProjectEventListenerAdapter.java rename to src/main/java/org/openmbee/mdk/mms/sync/coordinated/CoordinatedSyncProjectEventListenerAdapter.java index 92c5ca704..4a21ea7a3 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/sync/coordinated/CoordinatedSyncProjectEventListenerAdapter.java +++ b/src/main/java/org/openmbee/mdk/mms/sync/coordinated/CoordinatedSyncProjectEventListenerAdapter.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.mms.sync.coordinated; +package org.openmbee.mdk.mms.sync.coordinated; import com.nomagic.ci.persistence.IProject; import com.nomagic.magicdraw.core.Application; @@ -8,12 +8,11 @@ import com.nomagic.magicdraw.core.project.ProjectDescriptor; import com.nomagic.magicdraw.core.project.ProjectEventListenerAdapter; import com.nomagic.ui.ProgressStatusRunner; -import com.nomagic.uml2.ext.jmi.helpers.StereotypesHelper; -import gov.nasa.jpl.mbee.mdk.mms.actions.MMSLoginAction; -import gov.nasa.jpl.mbee.mdk.mms.sync.delta.DeltaSyncRunner; -import gov.nasa.jpl.mbee.mdk.options.MDKEnvironmentOptionsGroup; -import gov.nasa.jpl.mbee.mdk.options.MDKProjectOptions; -import gov.nasa.jpl.mbee.mdk.util.TicketUtils; +import org.openmbee.mdk.mms.actions.MMSLoginAction; +import org.openmbee.mdk.mms.sync.delta.DeltaSyncRunner; +import org.openmbee.mdk.options.MDKEnvironmentOptionsGroup; +import org.openmbee.mdk.options.MDKProjectOptions; +import org.openmbee.mdk.util.TicketUtils; import javax.annotation.CheckForNull; import java.util.Collections; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/sync/delta/DeltaSyncProjectEventListenerAdapter.java b/src/main/java/org/openmbee/mdk/mms/sync/delta/DeltaSyncProjectEventListenerAdapter.java similarity index 87% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/sync/delta/DeltaSyncProjectEventListenerAdapter.java rename to src/main/java/org/openmbee/mdk/mms/sync/delta/DeltaSyncProjectEventListenerAdapter.java index 0f62ff913..6664e2acc 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/sync/delta/DeltaSyncProjectEventListenerAdapter.java +++ b/src/main/java/org/openmbee/mdk/mms/sync/delta/DeltaSyncProjectEventListenerAdapter.java @@ -1,16 +1,15 @@ -package gov.nasa.jpl.mbee.mdk.mms.sync.delta; +package org.openmbee.mdk.mms.sync.delta; import com.fasterxml.jackson.core.JsonProcessingException; import com.nomagic.magicdraw.core.Project; import com.nomagic.magicdraw.core.project.ProjectEventListenerAdapter; import com.nomagic.magicdraw.openapi.uml.SessionManager; -import com.nomagic.uml2.ext.jmi.helpers.StereotypesHelper; -import gov.nasa.jpl.mbee.mdk.json.JacksonUtils; -import gov.nasa.jpl.mbee.mdk.mms.sync.local.LocalDeltaProjectEventListenerAdapter; -import gov.nasa.jpl.mbee.mdk.mms.sync.local.LocalDeltaTransactionCommitListener; -import gov.nasa.jpl.mbee.mdk.options.MDKEnvironmentOptionsGroup; -import gov.nasa.jpl.mbee.mdk.options.MDKProjectOptions; -import gov.nasa.jpl.mbee.mdk.util.Changelog; +import org.openmbee.mdk.json.JacksonUtils; +import org.openmbee.mdk.mms.sync.local.LocalDeltaProjectEventListenerAdapter; +import org.openmbee.mdk.mms.sync.local.LocalDeltaTransactionCommitListener; +import org.openmbee.mdk.options.MDKEnvironmentOptionsGroup; +import org.openmbee.mdk.options.MDKProjectOptions; +import org.openmbee.mdk.util.Changelog; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/sync/delta/DeltaSyncRunner.java b/src/main/java/org/openmbee/mdk/mms/sync/delta/DeltaSyncRunner.java similarity index 96% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/sync/delta/DeltaSyncRunner.java rename to src/main/java/org/openmbee/mdk/mms/sync/delta/DeltaSyncRunner.java index b4495a163..8e57e7edf 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/sync/delta/DeltaSyncRunner.java +++ b/src/main/java/org/openmbee/mdk/mms/sync/delta/DeltaSyncRunner.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.mms.sync.delta; +package org.openmbee.mdk.mms.sync.delta; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; @@ -14,23 +14,23 @@ import com.nomagic.task.RunnableWithProgress; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.ValueSpecification; -import gov.nasa.jpl.mbee.mdk.api.incubating.MDKConstants; -import gov.nasa.jpl.mbee.mdk.api.incubating.convert.Converters; -import gov.nasa.jpl.mbee.mdk.http.ServerException; -import gov.nasa.jpl.mbee.mdk.json.JacksonUtils; -import gov.nasa.jpl.mbee.mdk.mms.MMSUtils; -import gov.nasa.jpl.mbee.mdk.mms.actions.MMSLoginAction; -import gov.nasa.jpl.mbee.mdk.mms.actions.UpdateClientElementAction; -import gov.nasa.jpl.mbee.mdk.mms.endpoints.MMSElementsEndpoint; -import gov.nasa.jpl.mbee.mdk.mms.endpoints.MMSEndpointBuilderConstants; -import gov.nasa.jpl.mbee.mdk.mms.sync.local.LocalDeltaProjectEventListenerAdapter; -import gov.nasa.jpl.mbee.mdk.mms.sync.local.LocalDeltaTransactionCommitListener; -import gov.nasa.jpl.mbee.mdk.mms.sync.mms.MMSDeltaProjectEventListenerAdapter; -import gov.nasa.jpl.mbee.mdk.mms.validation.BranchValidator; -import gov.nasa.jpl.mbee.mdk.mms.validation.ElementValidator; -import gov.nasa.jpl.mbee.mdk.mms.validation.ProjectValidator; -import gov.nasa.jpl.mbee.mdk.util.*; -import gov.nasa.jpl.mbee.mdk.validation.ValidationSuite; +import org.openmbee.mdk.api.incubating.MDKConstants; +import org.openmbee.mdk.api.incubating.convert.Converters; +import org.openmbee.mdk.http.ServerException; +import org.openmbee.mdk.json.JacksonUtils; +import org.openmbee.mdk.mms.MMSUtils; +import org.openmbee.mdk.mms.actions.MMSLoginAction; +import org.openmbee.mdk.mms.actions.UpdateClientElementAction; +import org.openmbee.mdk.mms.endpoints.MMSElementsEndpoint; +import org.openmbee.mdk.mms.endpoints.MMSEndpointBuilderConstants; +import org.openmbee.mdk.mms.sync.local.LocalDeltaProjectEventListenerAdapter; +import org.openmbee.mdk.mms.sync.local.LocalDeltaTransactionCommitListener; +import org.openmbee.mdk.mms.sync.mms.MMSDeltaProjectEventListenerAdapter; +import org.openmbee.mdk.mms.validation.BranchValidator; +import org.openmbee.mdk.mms.validation.ElementValidator; +import org.openmbee.mdk.mms.validation.ProjectValidator; +import org.openmbee.mdk.util.*; +import org.openmbee.mdk.validation.ValidationSuite; import org.apache.http.client.methods.HttpRequestBase; import org.apache.http.entity.ContentType; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/sync/delta/SyncElement.java b/src/main/java/org/openmbee/mdk/mms/sync/delta/SyncElement.java similarity index 94% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/sync/delta/SyncElement.java rename to src/main/java/org/openmbee/mdk/mms/sync/delta/SyncElement.java index 11e5148b9..4cd69d715 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/sync/delta/SyncElement.java +++ b/src/main/java/org/openmbee/mdk/mms/sync/delta/SyncElement.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.mms.sync.delta; +package org.openmbee.mdk.mms.sync.delta; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.NamedElement; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/sync/delta/SyncElements.java b/src/main/java/org/openmbee/mdk/mms/sync/delta/SyncElements.java similarity index 96% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/sync/delta/SyncElements.java rename to src/main/java/org/openmbee/mdk/mms/sync/delta/SyncElements.java index 9430a9aee..088b19ed9 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/sync/delta/SyncElements.java +++ b/src/main/java/org/openmbee/mdk/mms/sync/delta/SyncElements.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.mms.sync.delta; +package org.openmbee.mdk.mms.sync.delta; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ArrayNode; @@ -13,10 +13,10 @@ import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.InstanceSpecification; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.LiteralString; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Package; -import gov.nasa.jpl.mbee.mdk.api.incubating.MDKConstants; -import gov.nasa.jpl.mbee.mdk.api.incubating.convert.Converters; -import gov.nasa.jpl.mbee.mdk.json.JacksonUtils; -import gov.nasa.jpl.mbee.mdk.util.Changelog; +import org.openmbee.mdk.api.incubating.MDKConstants; +import org.openmbee.mdk.api.incubating.convert.Converters; +import org.openmbee.mdk.json.JacksonUtils; +import org.openmbee.mdk.util.Changelog; import java.io.IOException; import java.time.ZonedDateTime; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/sync/local/LocalDeltaProjectEventListenerAdapter.java b/src/main/java/org/openmbee/mdk/mms/sync/local/LocalDeltaProjectEventListenerAdapter.java similarity index 98% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/sync/local/LocalDeltaProjectEventListenerAdapter.java rename to src/main/java/org/openmbee/mdk/mms/sync/local/LocalDeltaProjectEventListenerAdapter.java index 26f5fff18..47e3bb91e 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/sync/local/LocalDeltaProjectEventListenerAdapter.java +++ b/src/main/java/org/openmbee/mdk/mms/sync/local/LocalDeltaProjectEventListenerAdapter.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.mms.sync.local; +package org.openmbee.mdk.mms.sync.local; import com.nomagic.magicdraw.core.Project; import com.nomagic.magicdraw.core.project.ProjectEventListenerAdapter; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/sync/local/LocalDeltaTransactionCommitListener.java b/src/main/java/org/openmbee/mdk/mms/sync/local/LocalDeltaTransactionCommitListener.java similarity index 97% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/sync/local/LocalDeltaTransactionCommitListener.java rename to src/main/java/org/openmbee/mdk/mms/sync/local/LocalDeltaTransactionCommitListener.java index e799c0221..a8e3f592f 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/sync/local/LocalDeltaTransactionCommitListener.java +++ b/src/main/java/org/openmbee/mdk/mms/sync/local/LocalDeltaTransactionCommitListener.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.mms.sync.local; +package org.openmbee.mdk.mms.sync.local; import com.nomagic.magicdraw.core.Application; import com.nomagic.magicdraw.core.Project; @@ -8,12 +8,12 @@ import com.nomagic.uml2.ext.magicdraw.metadata.UMLPackage; import com.nomagic.uml2.impl.PropertyNames; import com.nomagic.uml2.transaction.TransactionCommitListener; -import gov.nasa.jpl.mbee.mdk.api.incubating.MDKConstants; -import gov.nasa.jpl.mbee.mdk.api.incubating.convert.Converters; -import gov.nasa.jpl.mbee.mdk.mms.sync.status.SyncStatusConfigurator; -import gov.nasa.jpl.mbee.mdk.options.MDKEnvironmentOptionsGroup; -import gov.nasa.jpl.mbee.mdk.util.Changelog; -import gov.nasa.jpl.mbee.mdk.util.MDUtils; +import org.openmbee.mdk.api.incubating.MDKConstants; +import org.openmbee.mdk.api.incubating.convert.Converters; +import org.openmbee.mdk.mms.sync.status.SyncStatusConfigurator; +import org.openmbee.mdk.options.MDKEnvironmentOptionsGroup; +import org.openmbee.mdk.util.Changelog; +import org.openmbee.mdk.util.MDUtils; import java.beans.PropertyChangeEvent; import java.util.Arrays; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/sync/manual/ManualSyncActionRunner.java b/src/main/java/org/openmbee/mdk/mms/sync/manual/ManualSyncActionRunner.java similarity index 98% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/sync/manual/ManualSyncActionRunner.java rename to src/main/java/org/openmbee/mdk/mms/sync/manual/ManualSyncActionRunner.java index 236f4c6a2..c91d692fa 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/sync/manual/ManualSyncActionRunner.java +++ b/src/main/java/org/openmbee/mdk/mms/sync/manual/ManualSyncActionRunner.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.mms.sync.manual; +package org.openmbee.mdk.mms.sync.manual; import com.nomagic.actions.NMAction; import com.nomagic.magicdraw.annotation.Annotation; @@ -51,4 +51,4 @@ public void run(ProgressStatus progressStatus) { Application.getInstance().getGUILog().log("[INFO] All validated elements are equivalent."); } } -} \ No newline at end of file +} diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/sync/manual/ManualSyncRunner.java b/src/main/java/org/openmbee/mdk/mms/sync/manual/ManualSyncRunner.java similarity index 91% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/sync/manual/ManualSyncRunner.java rename to src/main/java/org/openmbee/mdk/mms/sync/manual/ManualSyncRunner.java index f176809fa..3dd32ebce 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/sync/manual/ManualSyncRunner.java +++ b/src/main/java/org/openmbee/mdk/mms/sync/manual/ManualSyncRunner.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.mms.sync.manual; +package org.openmbee.mdk.mms.sync.manual; import com.fasterxml.jackson.databind.node.ObjectNode; import com.nomagic.magicdraw.core.Application; @@ -7,17 +7,19 @@ import com.nomagic.task.RunnableWithProgress; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Package; -import gov.nasa.jpl.mbee.mdk.api.incubating.convert.Converters; -import gov.nasa.jpl.mbee.mdk.http.ServerException; -import gov.nasa.jpl.mbee.mdk.mms.MMSUtils; -import gov.nasa.jpl.mbee.mdk.mms.endpoints.*; -import gov.nasa.jpl.mbee.mdk.mms.validation.BranchValidator; -import gov.nasa.jpl.mbee.mdk.mms.validation.ElementValidator; -import gov.nasa.jpl.mbee.mdk.mms.validation.ProjectValidator; -import gov.nasa.jpl.mbee.mdk.util.MDUtils; -import gov.nasa.jpl.mbee.mdk.util.Pair; -import gov.nasa.jpl.mbee.mdk.util.Utils; -import gov.nasa.jpl.mbee.mdk.validation.ValidationSuite; +import org.openmbee.mdk.api.incubating.convert.Converters; +import org.openmbee.mdk.http.ServerException; +import org.openmbee.mdk.mms.MMSUtils; +import org.openmbee.mdk.mms.endpoints.MMSElementsEndpoint; +import org.openmbee.mdk.mms.endpoints.MMSEndpointBuilderConstants; +import org.openmbee.mdk.mms.endpoints.MMSSearchEndpoint; +import org.openmbee.mdk.mms.validation.BranchValidator; +import org.openmbee.mdk.mms.validation.ElementValidator; +import org.openmbee.mdk.mms.validation.ProjectValidator; +import org.openmbee.mdk.util.MDUtils; +import org.openmbee.mdk.util.Pair; +import org.openmbee.mdk.util.Utils; +import org.openmbee.mdk.validation.ValidationSuite; import org.apache.http.client.methods.HttpRequestBase; import org.apache.http.entity.ContentType; @@ -26,7 +28,6 @@ import java.net.URISyntaxException; import java.security.GeneralSecurityException; import java.util.*; -import java.util.stream.Collectors; /** * Created by igomes on 9/26/16. diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/sync/mms/MMSDeltaProjectEventListenerAdapter.java b/src/main/java/org/openmbee/mdk/mms/sync/mms/MMSDeltaProjectEventListenerAdapter.java similarity index 94% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/sync/mms/MMSDeltaProjectEventListenerAdapter.java rename to src/main/java/org/openmbee/mdk/mms/sync/mms/MMSDeltaProjectEventListenerAdapter.java index 46049a21b..d6e59a6ba 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/sync/mms/MMSDeltaProjectEventListenerAdapter.java +++ b/src/main/java/org/openmbee/mdk/mms/sync/mms/MMSDeltaProjectEventListenerAdapter.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.mms.sync.mms; +package org.openmbee.mdk.mms.sync.mms; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; @@ -7,22 +7,25 @@ import com.nomagic.magicdraw.core.project.ProjectEventListenerAdapter; import com.nomagic.magicdraw.esi.EsiUtils; import com.nomagic.magicdraw.teamwork2.locks.ILockProjectService; -import com.nomagic.uml2.ext.jmi.helpers.StereotypesHelper; -import gov.nasa.jpl.mbee.mdk.api.incubating.MDKConstants; -import gov.nasa.jpl.mbee.mdk.api.incubating.convert.Converters; -import gov.nasa.jpl.mbee.mdk.emf.EMFImporter; -import gov.nasa.jpl.mbee.mdk.http.ServerException; -import gov.nasa.jpl.mbee.mdk.json.ImportException; -import gov.nasa.jpl.mbee.mdk.json.JacksonUtils; -import gov.nasa.jpl.mbee.mdk.mms.MMSUtils; -import gov.nasa.jpl.mbee.mdk.mms.actions.MMSLoginAction; -import gov.nasa.jpl.mbee.mdk.mms.endpoints.*; -import gov.nasa.jpl.mbee.mdk.mms.sync.delta.SyncElement; -import gov.nasa.jpl.mbee.mdk.mms.sync.delta.SyncElements; -import gov.nasa.jpl.mbee.mdk.mms.sync.status.SyncStatusConfigurator; -import gov.nasa.jpl.mbee.mdk.options.MDKProjectOptions; -import gov.nasa.jpl.mbee.mdk.util.*; +import org.openmbee.mdk.api.incubating.MDKConstants; +import org.openmbee.mdk.api.incubating.convert.Converters; +import org.openmbee.mdk.emf.EMFImporter; +import org.openmbee.mdk.http.ServerException; +import org.openmbee.mdk.json.ImportException; +import org.openmbee.mdk.json.JacksonUtils; +import org.openmbee.mdk.mms.MMSUtils; +import org.openmbee.mdk.mms.actions.MMSLoginAction; +import org.openmbee.mdk.mms.endpoints.MMSCommitEndpoint; +import org.openmbee.mdk.mms.endpoints.MMSCommitsEndpoint; +import org.openmbee.mdk.mms.endpoints.MMSEndpointBuilderConstants; +import org.openmbee.mdk.mms.sync.delta.SyncElement; +import org.openmbee.mdk.mms.sync.delta.SyncElements; +import org.openmbee.mdk.mms.sync.status.SyncStatusConfigurator; +import org.openmbee.mdk.options.MDKProjectOptions; import org.apache.http.client.methods.HttpRequestBase; +import org.openmbee.mdk.util.Changelog; +import org.openmbee.mdk.util.MDUtils; +import org.openmbee.mdk.util.TicketUtils; import java.io.File; import java.io.IOException; @@ -31,7 +34,6 @@ import java.text.NumberFormat; import java.util.*; import java.util.concurrent.ScheduledFuture; -import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; public class MMSDeltaProjectEventListenerAdapter extends ProjectEventListenerAdapter { diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/sync/status/SyncStatusConfigurator.java b/src/main/java/org/openmbee/mdk/mms/sync/status/SyncStatusConfigurator.java similarity index 92% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/sync/status/SyncStatusConfigurator.java rename to src/main/java/org/openmbee/mdk/mms/sync/status/SyncStatusConfigurator.java index 8f2b4edb8..eeabf5e50 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/sync/status/SyncStatusConfigurator.java +++ b/src/main/java/org/openmbee/mdk/mms/sync/status/SyncStatusConfigurator.java @@ -1,11 +1,11 @@ -package gov.nasa.jpl.mbee.mdk.mms.sync.status; +package org.openmbee.mdk.mms.sync.status; import com.nomagic.actions.AMConfigurator; import com.nomagic.actions.ActionsCategory; import com.nomagic.actions.ActionsManager; import com.nomagic.actions.NMAction; -import gov.nasa.jpl.mbee.mdk.MDKPlugin; -import gov.nasa.jpl.mbee.mdk.mms.sync.status.actions.SyncStatusAction; +import org.openmbee.mdk.MDKPlugin; +import org.openmbee.mdk.mms.sync.status.actions.SyncStatusAction; /** * Created by igomes on 8/16/16. diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/sync/status/SyncStatusProjectEventListenerAdapter.java b/src/main/java/org/openmbee/mdk/mms/sync/status/SyncStatusProjectEventListenerAdapter.java similarity index 94% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/sync/status/SyncStatusProjectEventListenerAdapter.java rename to src/main/java/org/openmbee/mdk/mms/sync/status/SyncStatusProjectEventListenerAdapter.java index bec094fdf..0f0e1cfbc 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/sync/status/SyncStatusProjectEventListenerAdapter.java +++ b/src/main/java/org/openmbee/mdk/mms/sync/status/SyncStatusProjectEventListenerAdapter.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.mms.sync.status; +package org.openmbee.mdk.mms.sync.status; import com.nomagic.magicdraw.core.Project; import com.nomagic.magicdraw.core.project.ProjectEventListenerAdapter; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/sync/status/actions/SyncStatusAction.java b/src/main/java/org/openmbee/mdk/mms/sync/status/actions/SyncStatusAction.java similarity index 94% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/sync/status/actions/SyncStatusAction.java rename to src/main/java/org/openmbee/mdk/mms/sync/status/actions/SyncStatusAction.java index cc5c0b292..868e4e565 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/sync/status/actions/SyncStatusAction.java +++ b/src/main/java/org/openmbee/mdk/mms/sync/status/actions/SyncStatusAction.java @@ -1,18 +1,18 @@ -package gov.nasa.jpl.mbee.mdk.mms.sync.status.actions; +package org.openmbee.mdk.mms.sync.status.actions; import com.nomagic.magicdraw.actions.MDAction; import com.nomagic.magicdraw.core.Application; import com.nomagic.magicdraw.core.Project; import com.nomagic.ui.ProgressStatusRunner; -import gov.nasa.jpl.mbee.mdk.MDKPlugin; -import gov.nasa.jpl.mbee.mdk.http.ServerException; -import gov.nasa.jpl.mbee.mdk.mms.sync.delta.SyncElement; -import gov.nasa.jpl.mbee.mdk.mms.sync.delta.SyncElements; -import gov.nasa.jpl.mbee.mdk.mms.sync.local.LocalDeltaProjectEventListenerAdapter; -import gov.nasa.jpl.mbee.mdk.mms.sync.local.LocalDeltaTransactionCommitListener; -import gov.nasa.jpl.mbee.mdk.mms.sync.mms.MMSDeltaProjectEventListenerAdapter; -import gov.nasa.jpl.mbee.mdk.mms.sync.status.ui.SyncStatusFrame; -import gov.nasa.jpl.mbee.mdk.util.Changelog; +import org.openmbee.mdk.MDKPlugin; +import org.openmbee.mdk.http.ServerException; +import org.openmbee.mdk.mms.sync.delta.SyncElement; +import org.openmbee.mdk.mms.sync.delta.SyncElements; +import org.openmbee.mdk.mms.sync.local.LocalDeltaProjectEventListenerAdapter; +import org.openmbee.mdk.mms.sync.local.LocalDeltaTransactionCommitListener; +import org.openmbee.mdk.mms.sync.mms.MMSDeltaProjectEventListenerAdapter; +import org.openmbee.mdk.mms.sync.status.ui.SyncStatusFrame; +import org.openmbee.mdk.util.Changelog; import javax.annotation.CheckForNull; import javax.swing.*; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/sync/status/ui/SyncStatusFrame.form b/src/main/java/org/openmbee/mdk/mms/sync/status/ui/SyncStatusFrame.form similarity index 99% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/sync/status/ui/SyncStatusFrame.form rename to src/main/java/org/openmbee/mdk/mms/sync/status/ui/SyncStatusFrame.form index ce6adc892..e8fe8aefa 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/sync/status/ui/SyncStatusFrame.form +++ b/src/main/java/org/openmbee/mdk/mms/sync/status/ui/SyncStatusFrame.form @@ -1,5 +1,5 @@ -
+ diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/sync/status/ui/SyncStatusFrame.java b/src/main/java/org/openmbee/mdk/mms/sync/status/ui/SyncStatusFrame.java similarity index 99% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/sync/status/ui/SyncStatusFrame.java rename to src/main/java/org/openmbee/mdk/mms/sync/status/ui/SyncStatusFrame.java index 9ce628c5f..0b508d2c4 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/sync/status/ui/SyncStatusFrame.java +++ b/src/main/java/org/openmbee/mdk/mms/sync/status/ui/SyncStatusFrame.java @@ -1,7 +1,7 @@ -package gov.nasa.jpl.mbee.mdk.mms.sync.status.ui; +package org.openmbee.mdk.mms.sync.status.ui; import com.nomagic.magicdraw.core.Application; -import gov.nasa.jpl.mbee.mdk.mms.actions.DetailedSyncStatusAction; +import org.openmbee.mdk.mms.actions.DetailedSyncStatusAction; import javax.swing.*; import java.awt.*; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/validation/BranchValidator.java b/src/main/java/org/openmbee/mdk/mms/validation/BranchValidator.java similarity index 91% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/validation/BranchValidator.java rename to src/main/java/org/openmbee/mdk/mms/validation/BranchValidator.java index 6f0f43729..e59d84562 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/validation/BranchValidator.java +++ b/src/main/java/org/openmbee/mdk/mms/validation/BranchValidator.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.mms.validation; +package org.openmbee.mdk.mms.validation; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; @@ -13,27 +13,24 @@ import com.nomagic.magicdraw.core.project.ProjectDescriptorsFactory; import com.nomagic.magicdraw.esi.EsiUtils; import com.nomagic.task.ProgressStatus; -import gov.nasa.jpl.mbee.mdk.actions.ClipboardAction; -import gov.nasa.jpl.mbee.mdk.api.incubating.MDKConstants; -import gov.nasa.jpl.mbee.mdk.api.incubating.convert.Converters; -import gov.nasa.jpl.mbee.mdk.http.ServerException; -import gov.nasa.jpl.mbee.mdk.json.JacksonUtils; -import gov.nasa.jpl.mbee.mdk.mms.MMSUtils; -import gov.nasa.jpl.mbee.mdk.mms.actions.CommitBranchAction; -import gov.nasa.jpl.mbee.mdk.mms.endpoints.MMSEndpoint; -import gov.nasa.jpl.mbee.mdk.mms.endpoints.MMSEndpointBuilderConstants; -import gov.nasa.jpl.mbee.mdk.mms.endpoints.MMSRefsEndpoint; -import gov.nasa.jpl.mbee.mdk.mms.json.JsonPatchFunction; -import gov.nasa.jpl.mbee.mdk.util.MDUtils; -import gov.nasa.jpl.mbee.mdk.util.Pair; -import gov.nasa.jpl.mbee.mdk.util.Utils; -import gov.nasa.jpl.mbee.mdk.validation.ValidationRule; -import gov.nasa.jpl.mbee.mdk.validation.ValidationRuleViolation; -import gov.nasa.jpl.mbee.mdk.validation.ValidationSuite; -import gov.nasa.jpl.mbee.mdk.validation.ViolationSeverity; +import org.openmbee.mdk.actions.ClipboardAction; +import org.openmbee.mdk.api.incubating.MDKConstants; +import org.openmbee.mdk.api.incubating.convert.Converters; +import org.openmbee.mdk.http.ServerException; +import org.openmbee.mdk.json.JacksonUtils; +import org.openmbee.mdk.mms.MMSUtils; +import org.openmbee.mdk.mms.actions.CommitBranchAction; +import org.openmbee.mdk.mms.endpoints.MMSEndpointBuilderConstants; +import org.openmbee.mdk.mms.endpoints.MMSRefsEndpoint; +import org.openmbee.mdk.mms.json.JsonPatchFunction; +import org.openmbee.mdk.util.MDUtils; +import org.openmbee.mdk.util.Pair; +import org.openmbee.mdk.util.Utils; +import org.openmbee.mdk.validation.ValidationRule; +import org.openmbee.mdk.validation.ValidationRuleViolation; +import org.openmbee.mdk.validation.ValidationSuite; +import org.openmbee.mdk.validation.ViolationSeverity; import org.apache.http.client.methods.HttpRequestBase; -import org.apache.http.client.utils.URIBuilder; -import org.apache.http.entity.ContentType; import java.io.File; import java.io.IOException; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/validation/DiagramValidator.java b/src/main/java/org/openmbee/mdk/mms/validation/DiagramValidator.java similarity index 92% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/validation/DiagramValidator.java rename to src/main/java/org/openmbee/mdk/mms/validation/DiagramValidator.java index 9e5f9a606..185487f3e 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/validation/DiagramValidator.java +++ b/src/main/java/org/openmbee/mdk/mms/validation/DiagramValidator.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.mms.validation; +package org.openmbee.mdk.mms.validation; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.JsonNode; @@ -10,21 +10,21 @@ import com.nomagic.task.ProgressStatus; import com.nomagic.task.RunnableWithProgress; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Diagram; -import gov.nasa.jpl.mbee.mdk.api.incubating.MDKConstants; -import gov.nasa.jpl.mbee.mdk.api.incubating.convert.Converters; -import gov.nasa.jpl.mbee.mdk.docgen.DocGenUtils; -import gov.nasa.jpl.mbee.mdk.http.ServerException; -import gov.nasa.jpl.mbee.mdk.json.JacksonUtils; -import gov.nasa.jpl.mbee.mdk.mms.MMSArtifact; -import gov.nasa.jpl.mbee.mdk.mms.MMSUtils; -import gov.nasa.jpl.mbee.mdk.mms.actions.CommitDiagramArtifactsAction; -import gov.nasa.jpl.mbee.mdk.mms.actions.ValidateElementAction; -import gov.nasa.jpl.mbee.mdk.util.MDUtils; -import gov.nasa.jpl.mbee.mdk.util.Pair; -import gov.nasa.jpl.mbee.mdk.validation.ValidationRule; -import gov.nasa.jpl.mbee.mdk.validation.ValidationRuleViolation; -import gov.nasa.jpl.mbee.mdk.validation.ValidationSuite; -import gov.nasa.jpl.mbee.mdk.validation.ViolationSeverity; +import org.openmbee.mdk.api.incubating.MDKConstants; +import org.openmbee.mdk.api.incubating.convert.Converters; +import org.openmbee.mdk.docgen.DocGenUtils; +import org.openmbee.mdk.http.ServerException; +import org.openmbee.mdk.json.JacksonUtils; +import org.openmbee.mdk.mms.MMSArtifact; +import org.openmbee.mdk.mms.MMSUtils; +import org.openmbee.mdk.mms.actions.CommitDiagramArtifactsAction; +import org.openmbee.mdk.mms.actions.ValidateElementAction; +import org.openmbee.mdk.util.MDUtils; +import org.openmbee.mdk.util.Pair; +import org.openmbee.mdk.validation.ValidationRule; +import org.openmbee.mdk.validation.ValidationRuleViolation; +import org.openmbee.mdk.validation.ValidationSuite; +import org.openmbee.mdk.validation.ViolationSeverity; import org.apache.commons.codec.digest.DigestUtils; import org.apache.http.entity.ContentType; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/validation/ElementValidator.java b/src/main/java/org/openmbee/mdk/mms/validation/ElementValidator.java similarity index 94% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/validation/ElementValidator.java rename to src/main/java/org/openmbee/mdk/mms/validation/ElementValidator.java index a93484768..53e3a659d 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/validation/ElementValidator.java +++ b/src/main/java/org/openmbee/mdk/mms/validation/ElementValidator.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.mms.validation; +package org.openmbee.mdk.mms.validation; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; @@ -11,19 +11,19 @@ import com.nomagic.task.RunnableWithProgress; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.NamedElement; -import gov.nasa.jpl.mbee.mdk.actions.ClipboardAction; -import gov.nasa.jpl.mbee.mdk.api.incubating.MDKConstants; -import gov.nasa.jpl.mbee.mdk.api.incubating.convert.Converters; -import gov.nasa.jpl.mbee.mdk.json.JacksonUtils; -import gov.nasa.jpl.mbee.mdk.mms.actions.CommitClientElementAction; -import gov.nasa.jpl.mbee.mdk.mms.actions.ElementDiffAction; -import gov.nasa.jpl.mbee.mdk.mms.actions.UpdateClientElementAction; -import gov.nasa.jpl.mbee.mdk.mms.json.JsonPatchFunction; -import gov.nasa.jpl.mbee.mdk.util.Pair; -import gov.nasa.jpl.mbee.mdk.validation.ValidationRule; -import gov.nasa.jpl.mbee.mdk.validation.ValidationRuleViolation; -import gov.nasa.jpl.mbee.mdk.validation.ValidationSuite; -import gov.nasa.jpl.mbee.mdk.validation.ViolationSeverity; +import org.openmbee.mdk.actions.ClipboardAction; +import org.openmbee.mdk.api.incubating.MDKConstants; +import org.openmbee.mdk.api.incubating.convert.Converters; +import org.openmbee.mdk.json.JacksonUtils; +import org.openmbee.mdk.mms.actions.CommitClientElementAction; +import org.openmbee.mdk.mms.actions.ElementDiffAction; +import org.openmbee.mdk.mms.actions.UpdateClientElementAction; +import org.openmbee.mdk.mms.json.JsonPatchFunction; +import org.openmbee.mdk.util.Pair; +import org.openmbee.mdk.validation.ValidationRule; +import org.openmbee.mdk.validation.ValidationRuleViolation; +import org.openmbee.mdk.validation.ValidationSuite; +import org.openmbee.mdk.validation.ViolationSeverity; import java.io.File; import java.io.IOException; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/validation/ProjectValidator.java b/src/main/java/org/openmbee/mdk/mms/validation/ProjectValidator.java similarity index 93% rename from src/main/java/gov/nasa/jpl/mbee/mdk/mms/validation/ProjectValidator.java rename to src/main/java/org/openmbee/mdk/mms/validation/ProjectValidator.java index ac25d740c..951059a1b 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/validation/ProjectValidator.java +++ b/src/main/java/org/openmbee/mdk/mms/validation/ProjectValidator.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.mms.validation; +package org.openmbee.mdk.mms.validation; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.JsonNode; @@ -12,20 +12,20 @@ import com.nomagic.magicdraw.teamwork2.ITeamworkService; import com.nomagic.magicdraw.teamwork2.TeamworkService; -import gov.nasa.jpl.mbee.mdk.api.incubating.MDKConstants; -import gov.nasa.jpl.mbee.mdk.api.incubating.convert.Converters; -import gov.nasa.jpl.mbee.mdk.http.ServerException; -import gov.nasa.jpl.mbee.mdk.json.JacksonUtils; -import gov.nasa.jpl.mbee.mdk.mms.MMSUtils; -import gov.nasa.jpl.mbee.mdk.mms.actions.CommitProjectAction; -import gov.nasa.jpl.mbee.mdk.mms.endpoints.*; -import gov.nasa.jpl.mbee.mdk.options.MDKProjectOptions; -import gov.nasa.jpl.mbee.mdk.validation.ValidationRule; -import gov.nasa.jpl.mbee.mdk.validation.ValidationRuleViolation; -import gov.nasa.jpl.mbee.mdk.validation.ValidationSuite; -import gov.nasa.jpl.mbee.mdk.validation.ViolationSeverity; +import org.openmbee.mdk.api.incubating.MDKConstants; +import org.openmbee.mdk.api.incubating.convert.Converters; +import org.openmbee.mdk.http.ServerException; +import org.openmbee.mdk.json.JacksonUtils; +import org.openmbee.mdk.mms.MMSUtils; +import org.openmbee.mdk.mms.actions.CommitProjectAction; +import org.openmbee.mdk.options.MDKProjectOptions; +import org.openmbee.mdk.validation.ValidationRule; +import org.openmbee.mdk.validation.ValidationRuleViolation; +import org.openmbee.mdk.validation.ValidationSuite; +import org.openmbee.mdk.validation.ViolationSeverity; import org.apache.http.client.methods.HttpRequestBase; import org.apache.http.entity.ContentType; +import org.openmbee.mdk.mms.endpoints.MMSProjectsEndpoint; import javax.swing.JOptionPane; import java.io.File; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/model/AbstractModelVisitor.java b/src/main/java/org/openmbee/mdk/model/AbstractModelVisitor.java similarity index 91% rename from src/main/java/gov/nasa/jpl/mbee/mdk/model/AbstractModelVisitor.java rename to src/main/java/org/openmbee/mdk/model/AbstractModelVisitor.java index 7c5c553f0..00c32187e 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/model/AbstractModelVisitor.java +++ b/src/main/java/org/openmbee/mdk/model/AbstractModelVisitor.java @@ -1,7 +1,7 @@ -package gov.nasa.jpl.mbee.mdk.model; +package org.openmbee.mdk.model; import com.nomagic.magicdraw.core.Application; -import gov.nasa.jpl.mbee.mdk.api.incubating.convert.Converters; +import org.openmbee.mdk.api.incubating.convert.Converters; public abstract class AbstractModelVisitor implements IModelVisitor { diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/model/BehaviorQuery.java b/src/main/java/org/openmbee/mdk/model/BehaviorQuery.java similarity index 97% rename from src/main/java/gov/nasa/jpl/mbee/mdk/model/BehaviorQuery.java rename to src/main/java/org/openmbee/mdk/model/BehaviorQuery.java index 1e12e4602..e1f5219f5 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/model/BehaviorQuery.java +++ b/src/main/java/org/openmbee/mdk/model/BehaviorQuery.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.model; +package org.openmbee.mdk.model; import com.nomagic.magicdraw.core.Application; import com.nomagic.magicdraw.expressions.ExpressionHelper; @@ -8,8 +8,8 @@ import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.NamedElement; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.ParameterDirectionKindEnum; import com.nomagic.uml2.ext.magicdraw.commonbehaviors.mdbasicbehaviors.Behavior; -import gov.nasa.jpl.mbee.mdk.api.incubating.convert.Converters; -import gov.nasa.jpl.mbee.mdk.docgen.docbook.DocumentElement; +import org.openmbee.mdk.api.incubating.convert.Converters; +import org.openmbee.mdk.docgen.docbook.DocumentElement; import org.apache.commons.lang3.ObjectUtils; import java.util.*; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/model/BulletedList.java b/src/main/java/org/openmbee/mdk/model/BulletedList.java similarity index 96% rename from src/main/java/gov/nasa/jpl/mbee/mdk/model/BulletedList.java rename to src/main/java/org/openmbee/mdk/model/BulletedList.java index fea91a543..ca35fc277 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/model/BulletedList.java +++ b/src/main/java/org/openmbee/mdk/model/BulletedList.java @@ -1,13 +1,13 @@ -package gov.nasa.jpl.mbee.mdk.model; +package org.openmbee.mdk.model; import com.nomagic.uml2.ext.jmi.helpers.ModelHelper; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.NamedElement; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Property; -import gov.nasa.jpl.mbee.mdk.SysMLExtensions; -import gov.nasa.jpl.mbee.mdk.docgen.docbook.*; -import gov.nasa.jpl.mbee.mdk.util.GeneratorUtils; -import gov.nasa.jpl.mbee.mdk.util.Utils; +import org.openmbee.mdk.SysMLExtensions; +import org.openmbee.mdk.util.GeneratorUtils; +import org.openmbee.mdk.util.Utils; +import org.openmbee.mdk.docgen.docbook.*; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/model/CollectActionsVisitor.java b/src/main/java/org/openmbee/mdk/model/CollectActionsVisitor.java similarity index 94% rename from src/main/java/gov/nasa/jpl/mbee/mdk/model/CollectActionsVisitor.java rename to src/main/java/org/openmbee/mdk/model/CollectActionsVisitor.java index bd8d6cbf3..cfc185268 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/model/CollectActionsVisitor.java +++ b/src/main/java/org/openmbee/mdk/model/CollectActionsVisitor.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.model; +package org.openmbee.mdk.model; import com.nomagic.magicdraw.actions.MDAction; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/model/Common.java b/src/main/java/org/openmbee/mdk/model/Common.java similarity index 90% rename from src/main/java/gov/nasa/jpl/mbee/mdk/model/Common.java rename to src/main/java/org/openmbee/mdk/model/Common.java index 523675c4c..bdeb82262 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/model/Common.java +++ b/src/main/java/org/openmbee/mdk/model/Common.java @@ -1,14 +1,14 @@ -package gov.nasa.jpl.mbee.mdk.model; +package org.openmbee.mdk.model; import com.nomagic.uml2.ext.jmi.helpers.StereotypesHelper; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Property; -import gov.nasa.jpl.mbee.mdk.SysMLExtensions; -import gov.nasa.jpl.mbee.mdk.docgen.docbook.DBHasContent; -import gov.nasa.jpl.mbee.mdk.docgen.docbook.DBParagraph; -import gov.nasa.jpl.mbee.mdk.docgen.docbook.DBTableEntry; -import gov.nasa.jpl.mbee.mdk.docgen.docbook.DocumentElement; -import gov.nasa.jpl.mbee.mdk.docgen.docbook.stereotypes.EditableChoosable; +import org.openmbee.mdk.SysMLExtensions; +import org.openmbee.mdk.docgen.docbook.DBHasContent; +import org.openmbee.mdk.docgen.docbook.DBParagraph; +import org.openmbee.mdk.docgen.docbook.DBTableEntry; +import org.openmbee.mdk.docgen.docbook.DocumentElement; +import org.openmbee.mdk.docgen.docbook.stereotypes.EditableChoosable; import java.util.*; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/model/Container.java b/src/main/java/org/openmbee/mdk/model/Container.java similarity index 94% rename from src/main/java/gov/nasa/jpl/mbee/mdk/model/Container.java rename to src/main/java/org/openmbee/mdk/model/Container.java index ec017fd57..7db234f3e 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/model/Container.java +++ b/src/main/java/org/openmbee/mdk/model/Container.java @@ -1,6 +1,6 @@ -package gov.nasa.jpl.mbee.mdk.model; +package org.openmbee.mdk.model; -import gov.nasa.jpl.mbee.mdk.util.MoreToString; +import org.openmbee.mdk.util.MoreToString; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/model/DocBookOutputVisitor.java b/src/main/java/org/openmbee/mdk/model/DocBookOutputVisitor.java similarity index 97% rename from src/main/java/gov/nasa/jpl/mbee/mdk/model/DocBookOutputVisitor.java rename to src/main/java/org/openmbee/mdk/model/DocBookOutputVisitor.java index 279b503cd..2ffb19c1a 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/model/DocBookOutputVisitor.java +++ b/src/main/java/org/openmbee/mdk/model/DocBookOutputVisitor.java @@ -1,6 +1,6 @@ -package gov.nasa.jpl.mbee.mdk.model; +package org.openmbee.mdk.model; -import gov.nasa.jpl.mbee.mdk.docgen.docbook.*; +import org.openmbee.mdk.docgen.docbook.*; import java.util.List; import java.util.Stack; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/model/DocGenElement.java b/src/main/java/org/openmbee/mdk/model/DocGenElement.java similarity index 96% rename from src/main/java/gov/nasa/jpl/mbee/mdk/model/DocGenElement.java rename to src/main/java/org/openmbee/mdk/model/DocGenElement.java index 499931e8f..f8d48220c 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/model/DocGenElement.java +++ b/src/main/java/org/openmbee/mdk/model/DocGenElement.java @@ -1,7 +1,7 @@ -package gov.nasa.jpl.mbee.mdk.model; +package org.openmbee.mdk.model; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; -import gov.nasa.jpl.mbee.mdk.SysMLExtensions; +import org.openmbee.mdk.SysMLExtensions; public abstract class DocGenElement implements IDocGenElement { diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/model/DocGenValidationDBSwitch.java b/src/main/java/org/openmbee/mdk/model/DocGenValidationDBSwitch.java similarity index 82% rename from src/main/java/gov/nasa/jpl/mbee/mdk/model/DocGenValidationDBSwitch.java rename to src/main/java/org/openmbee/mdk/model/DocGenValidationDBSwitch.java index 3923f44eb..38a89103b 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/model/DocGenValidationDBSwitch.java +++ b/src/main/java/org/openmbee/mdk/model/DocGenValidationDBSwitch.java @@ -1,12 +1,12 @@ -package gov.nasa.jpl.mbee.mdk.model; +package org.openmbee.mdk.model; import com.nomagic.magicdraw.core.Application; -import gov.nasa.jpl.mbee.mdk.api.incubating.convert.Converters; -import gov.nasa.jpl.mbee.mdk.docgen.validation.*; -import gov.nasa.jpl.mbee.mdk.validation.ValidationRule; -import gov.nasa.jpl.mbee.mdk.validation.ValidationRuleViolation; -import gov.nasa.jpl.mbee.mdk.validation.ValidationSuite; -import gov.nasa.jpl.mbee.mdk.validation.ViolationSeverity; +import org.openmbee.mdk.api.incubating.convert.Converters; +import org.openmbee.mdk.validation.ValidationRule; +import org.openmbee.mdk.validation.ValidationRuleViolation; +import org.openmbee.mdk.validation.ValidationSuite; +import org.openmbee.mdk.validation.ViolationSeverity; +import org.openmbee.mdk.docgen.validation.*; public class DocGenValidationDBSwitch extends DocGenValidationSwitch { diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/model/Document.java b/src/main/java/org/openmbee/mdk/model/Document.java similarity index 96% rename from src/main/java/gov/nasa/jpl/mbee/mdk/model/Document.java rename to src/main/java/org/openmbee/mdk/model/Document.java index 4bc6e4c2e..1ea4330b1 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/model/Document.java +++ b/src/main/java/org/openmbee/mdk/model/Document.java @@ -1,6 +1,6 @@ -package gov.nasa.jpl.mbee.mdk.model; +package org.openmbee.mdk.model; -import gov.nasa.jpl.mbee.mdk.model.docmeta.DocumentMeta; +import org.openmbee.mdk.model.docmeta.DocumentMeta; import java.lang.reflect.Field; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/model/GenericTable.java b/src/main/java/org/openmbee/mdk/model/GenericTable.java similarity index 96% rename from src/main/java/gov/nasa/jpl/mbee/mdk/model/GenericTable.java rename to src/main/java/org/openmbee/mdk/model/GenericTable.java index 206eb2f31..902083d6b 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/model/GenericTable.java +++ b/src/main/java/org/openmbee/mdk/model/GenericTable.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.model; +package org.openmbee.mdk.model; import com.nomagic.generictable.GenericTableManager; import com.nomagic.magicdraw.core.Application; @@ -13,13 +13,13 @@ import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.InstanceSpecification; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.NamedElement; -import gov.nasa.jpl.mbee.mdk.docgen.docbook.*; -import gov.nasa.jpl.mbee.mdk.mms.sync.local.LocalDeltaProjectEventListenerAdapter; -import gov.nasa.jpl.mbee.mdk.mms.sync.local.LocalDeltaTransactionCommitListener; -import gov.nasa.jpl.mbee.mdk.util.DependencyMatrixTool; -import gov.nasa.jpl.mbee.mdk.util.GeneratorUtils; -import gov.nasa.jpl.mbee.mdk.util.MatrixUtil; -import gov.nasa.jpl.mbee.mdk.util.Utils; +import org.openmbee.mdk.mms.sync.local.LocalDeltaProjectEventListenerAdapter; +import org.openmbee.mdk.mms.sync.local.LocalDeltaTransactionCommitListener; +import org.openmbee.mdk.util.DependencyMatrixTool; +import org.openmbee.mdk.util.GeneratorUtils; +import org.openmbee.mdk.util.MatrixUtil; +import org.openmbee.mdk.util.Utils; +import org.openmbee.mdk.docgen.docbook.*; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/model/HierarchicalPropertiesTable.java b/src/main/java/org/openmbee/mdk/model/HierarchicalPropertiesTable.java similarity index 97% rename from src/main/java/gov/nasa/jpl/mbee/mdk/model/HierarchicalPropertiesTable.java rename to src/main/java/org/openmbee/mdk/model/HierarchicalPropertiesTable.java index 20bce88ad..b1a3671d2 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/model/HierarchicalPropertiesTable.java +++ b/src/main/java/org/openmbee/mdk/model/HierarchicalPropertiesTable.java @@ -1,11 +1,11 @@ -package gov.nasa.jpl.mbee.mdk.model; +package org.openmbee.mdk.model; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.NamedElement; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Property; import com.nomagic.uml2.ext.magicdraw.mdprofiles.Stereotype; -import gov.nasa.jpl.mbee.mdk.SysMLExtensions; -import gov.nasa.jpl.mbee.mdk.docgen.DocGenUtils; -import gov.nasa.jpl.mbee.mdk.util.GeneratorUtils; +import org.openmbee.mdk.SysMLExtensions; +import org.openmbee.mdk.docgen.DocGenUtils; +import org.openmbee.mdk.util.GeneratorUtils; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/model/IDocGenElement.java b/src/main/java/org/openmbee/mdk/model/IDocGenElement.java similarity index 65% rename from src/main/java/gov/nasa/jpl/mbee/mdk/model/IDocGenElement.java rename to src/main/java/org/openmbee/mdk/model/IDocGenElement.java index 8ffd217a4..aa5cb4491 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/model/IDocGenElement.java +++ b/src/main/java/org/openmbee/mdk/model/IDocGenElement.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.model; +package org.openmbee.mdk.model; public interface IDocGenElement { void accept(IModelVisitor v); diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/model/IModelVisitor.java b/src/main/java/org/openmbee/mdk/model/IModelVisitor.java similarity index 77% rename from src/main/java/gov/nasa/jpl/mbee/mdk/model/IModelVisitor.java rename to src/main/java/org/openmbee/mdk/model/IModelVisitor.java index 963dcc8a9..b8b59b8a3 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/model/IModelVisitor.java +++ b/src/main/java/org/openmbee/mdk/model/IModelVisitor.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.model; +package org.openmbee.mdk.model; public interface IModelVisitor { diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/model/Image.java b/src/main/java/org/openmbee/mdk/model/Image.java similarity index 90% rename from src/main/java/gov/nasa/jpl/mbee/mdk/model/Image.java rename to src/main/java/org/openmbee/mdk/model/Image.java index eba60e3e1..93260a625 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/model/Image.java +++ b/src/main/java/org/openmbee/mdk/model/Image.java @@ -1,14 +1,14 @@ -package gov.nasa.jpl.mbee.mdk.model; +package org.openmbee.mdk.model; import com.nomagic.uml2.ext.jmi.helpers.ModelHelper; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Diagram; -import gov.nasa.jpl.mbee.mdk.api.incubating.convert.Converters; -import gov.nasa.jpl.mbee.mdk.docgen.docbook.DBImage; -import gov.nasa.jpl.mbee.mdk.docgen.docbook.DBParagraph; -import gov.nasa.jpl.mbee.mdk.docgen.docbook.DocumentElement; -import gov.nasa.jpl.mbee.mdk.docgen.docbook.From; -import gov.nasa.jpl.mbee.mdk.util.GeneratorUtils; -import gov.nasa.jpl.mbee.mdk.util.Utils; +import org.openmbee.mdk.api.incubating.convert.Converters; +import org.openmbee.mdk.docgen.docbook.DBImage; +import org.openmbee.mdk.docgen.docbook.DBParagraph; +import org.openmbee.mdk.docgen.docbook.DocumentElement; +import org.openmbee.mdk.docgen.docbook.From; +import org.openmbee.mdk.util.GeneratorUtils; +import org.openmbee.mdk.util.Utils; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/model/Paragraph.java b/src/main/java/org/openmbee/mdk/model/Paragraph.java similarity index 96% rename from src/main/java/gov/nasa/jpl/mbee/mdk/model/Paragraph.java rename to src/main/java/org/openmbee/mdk/model/Paragraph.java index 90eea37a8..dd2d0cca5 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/model/Paragraph.java +++ b/src/main/java/org/openmbee/mdk/model/Paragraph.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.model; +package org.openmbee.mdk.model; import com.nomagic.magicdraw.core.Application; import com.nomagic.uml2.ext.jmi.helpers.ModelHelper; @@ -6,13 +6,12 @@ import com.nomagic.uml2.ext.magicdraw.activities.mdbasicactivities.InitialNode; import com.nomagic.uml2.ext.magicdraw.activities.mdfundamentalactivities.ActivityNode; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.*; -import gov.nasa.jpl.mbee.mdk.docgen.ViewViewpointValidator; -import gov.nasa.jpl.mbee.mdk.docgen.docbook.DBParagraph; -import gov.nasa.jpl.mbee.mdk.docgen.docbook.DocumentElement; -import gov.nasa.jpl.mbee.mdk.docgen.docbook.From; -import gov.nasa.jpl.mbee.mdk.generator.GenerationContext; -import gov.nasa.jpl.mbee.mdk.util.*; -import gov.nasa.jpl.mbee.mdk.util.Utils.AvailableAttribute; +import org.openmbee.mdk.docgen.ViewViewpointValidator; +import org.openmbee.mdk.docgen.docbook.DBParagraph; +import org.openmbee.mdk.docgen.docbook.DocumentElement; +import org.openmbee.mdk.docgen.docbook.From; +import org.openmbee.mdk.generator.GenerationContext; +import org.openmbee.mdk.util.*; import java.util.*; @@ -25,7 +24,7 @@ public class Paragraph extends Query { private ViewViewpointValidator validator = null; private boolean tryOcl = false; private boolean iterate = true; - private AvailableAttribute attribute = null; // this is redundant with fromProperty + private Utils.AvailableAttribute attribute = null; // this is redundant with fromProperty public InitialNode bnode; public ActivityNode activityNode; @@ -188,7 +187,7 @@ else if (!Utils2.isNullOrEmpty(result)) { * 9  O && T && R && S: return a paragraph of the evaluation of the text as OCL on each target-property pair
* *

- * @see gov.nasa.jpl.mbee.mdk.model.Query#visit(boolean, java.lang.String) + * @see Query#visit(boolean, java.lang.String) */ @Override public List visit(boolean forViewEditor, String outputDir) { @@ -284,7 +283,7 @@ else if (!tryOcl) { // for cases 2 and 5 //Object ocl = allTargetsAreProperties ? : ModelHelper.getComment( e ); if (allTargetsAreProperties && tryOcl) { - Object v = Utils.getElementAttribute(e, AvailableAttribute.Value); + Object v = Utils.getElementAttribute(e, Utils.AvailableAttribute.Value); ref = new Reference(e, From.DVALUE, v); } else { diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/model/Plot.java b/src/main/java/org/openmbee/mdk/model/Plot.java similarity index 93% rename from src/main/java/gov/nasa/jpl/mbee/mdk/model/Plot.java rename to src/main/java/org/openmbee/mdk/model/Plot.java index 89b1db4b0..b40355bd6 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/model/Plot.java +++ b/src/main/java/org/openmbee/mdk/model/Plot.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.model; +package org.openmbee.mdk.model; import com.nomagic.uml2.ext.magicdraw.actions.mdbasicactions.CallBehaviorAction; import com.nomagic.uml2.ext.magicdraw.activities.mdbasicactivities.ActivityEdge; @@ -7,11 +7,11 @@ import com.nomagic.uml2.ext.magicdraw.activities.mdstructuredactivities.StructuredActivityNode; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.EnumerationLiteral; -import gov.nasa.jpl.mbee.mdk.docgen.docbook.DBPlot; -import gov.nasa.jpl.mbee.mdk.docgen.docbook.DBTable; -import gov.nasa.jpl.mbee.mdk.docgen.docbook.DocumentElement; -import gov.nasa.jpl.mbee.mdk.docgen.ViewViewpointValidator; -import gov.nasa.jpl.mbee.mdk.util.GeneratorUtils; +import org.openmbee.mdk.docgen.docbook.DBPlot; +import org.openmbee.mdk.docgen.docbook.DBTable; +import org.openmbee.mdk.docgen.docbook.DocumentElement; +import org.openmbee.mdk.docgen.ViewViewpointValidator; +import org.openmbee.mdk.util.GeneratorUtils; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/model/PropertiesTableByAttributes.java b/src/main/java/org/openmbee/mdk/model/PropertiesTableByAttributes.java similarity index 97% rename from src/main/java/gov/nasa/jpl/mbee/mdk/model/PropertiesTableByAttributes.java rename to src/main/java/org/openmbee/mdk/model/PropertiesTableByAttributes.java index acef71a5e..43529ad93 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/model/PropertiesTableByAttributes.java +++ b/src/main/java/org/openmbee/mdk/model/PropertiesTableByAttributes.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.model; +package org.openmbee.mdk.model; import com.nomagic.magicdraw.actions.MDAction; import com.nomagic.uml2.ext.jmi.helpers.ModelHelper; @@ -7,15 +7,15 @@ import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.NamedElement; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Property; import com.nomagic.uml2.ext.magicdraw.mdprofiles.Stereotype; -import gov.nasa.jpl.mbee.mdk.SysMLExtensions; -import gov.nasa.jpl.mbee.mdk.docgen.DocGenUtils; -import gov.nasa.jpl.mbee.mdk.docgen.docbook.*; -import gov.nasa.jpl.mbee.mdk.docgen.table.EditableTable; -import gov.nasa.jpl.mbee.mdk.docgen.table.PropertiesTable; -import gov.nasa.jpl.mbee.mdk.model.actions.EditPropertiesTableAction; -import gov.nasa.jpl.mbee.mdk.util.GeneratorUtils; -import gov.nasa.jpl.mbee.mdk.util.Utils; -import gov.nasa.jpl.mbee.mdk.util.Utils2; +import org.openmbee.mdk.SysMLExtensions; +import org.openmbee.mdk.docgen.DocGenUtils; +import org.openmbee.mdk.docgen.table.EditableTable; +import org.openmbee.mdk.docgen.table.PropertiesTable; +import org.openmbee.mdk.model.actions.EditPropertiesTableAction; +import org.openmbee.mdk.util.GeneratorUtils; +import org.openmbee.mdk.util.Utils; +import org.openmbee.mdk.util.Utils2; +import org.openmbee.mdk.docgen.docbook.*; import java.util.*; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/model/Query.java b/src/main/java/org/openmbee/mdk/model/Query.java similarity index 94% rename from src/main/java/gov/nasa/jpl/mbee/mdk/model/Query.java rename to src/main/java/org/openmbee/mdk/model/Query.java index 4ddb4f5c8..29679b264 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/model/Query.java +++ b/src/main/java/org/openmbee/mdk/model/Query.java @@ -1,10 +1,10 @@ -package gov.nasa.jpl.mbee.mdk.model; +package org.openmbee.mdk.model; import com.nomagic.magicdraw.actions.MDAction; import com.nomagic.magicdraw.core.Application; -import gov.nasa.jpl.mbee.mdk.SysMLExtensions; -import gov.nasa.jpl.mbee.mdk.docgen.docbook.DocumentElement; -import gov.nasa.jpl.mbee.mdk.generator.Generatable; +import org.openmbee.mdk.SysMLExtensions; +import org.openmbee.mdk.docgen.docbook.DocumentElement; +import org.openmbee.mdk.generator.Generatable; import java.lang.reflect.Field; import java.util.ArrayList; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/model/Reference.java b/src/main/java/org/openmbee/mdk/model/Reference.java similarity index 97% rename from src/main/java/gov/nasa/jpl/mbee/mdk/model/Reference.java rename to src/main/java/org/openmbee/mdk/model/Reference.java index 41b1582dc..bd404cafe 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/model/Reference.java +++ b/src/main/java/org/openmbee/mdk/model/Reference.java @@ -1,11 +1,11 @@ -package gov.nasa.jpl.mbee.mdk.model; +package org.openmbee.mdk.model; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.NamedElement; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Property; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Slot; -import gov.nasa.jpl.mbee.mdk.docgen.docbook.From; -import gov.nasa.jpl.mbee.mdk.util.Utils; +import org.openmbee.mdk.docgen.docbook.From; +import org.openmbee.mdk.util.Utils; import java.util.List; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/model/Section.java b/src/main/java/org/openmbee/mdk/model/Section.java similarity index 97% rename from src/main/java/gov/nasa/jpl/mbee/mdk/model/Section.java rename to src/main/java/org/openmbee/mdk/model/Section.java index f9a31460f..fae316a46 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/model/Section.java +++ b/src/main/java/org/openmbee/mdk/model/Section.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.model; +package org.openmbee.mdk.model; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/model/Simulate.java b/src/main/java/org/openmbee/mdk/model/Simulate.java similarity index 97% rename from src/main/java/gov/nasa/jpl/mbee/mdk/model/Simulate.java rename to src/main/java/org/openmbee/mdk/model/Simulate.java index b034076fc..e3261d93a 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/model/Simulate.java +++ b/src/main/java/org/openmbee/mdk/model/Simulate.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.model; +package org.openmbee.mdk.model; import com.nomagic.magicdraw.core.Application; import com.nomagic.magicdraw.core.Project; @@ -7,7 +7,7 @@ import com.nomagic.magicdraw.simulation.execution.SimulationResult; import com.nomagic.uml2.ext.jmi.helpers.StereotypesHelper; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; -import gov.nasa.jpl.mbee.mdk.docgen.docbook.DocumentElement; +import org.openmbee.mdk.docgen.docbook.DocumentElement; import java.text.NumberFormat; import java.util.Collections; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/model/Table.java b/src/main/java/org/openmbee/mdk/model/Table.java similarity index 95% rename from src/main/java/gov/nasa/jpl/mbee/mdk/model/Table.java rename to src/main/java/org/openmbee/mdk/model/Table.java index 758646622..08bfa7b0d 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/model/Table.java +++ b/src/main/java/org/openmbee/mdk/model/Table.java @@ -1,10 +1,10 @@ -package gov.nasa.jpl.mbee.mdk.model; +package org.openmbee.mdk.model; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Property; -import gov.nasa.jpl.mbee.mdk.SysMLExtensions; -import gov.nasa.jpl.mbee.mdk.docgen.docbook.DBColSpec; -import gov.nasa.jpl.mbee.mdk.docgen.docbook.DBTable; -import gov.nasa.jpl.mbee.mdk.util.GeneratorUtils; +import org.openmbee.mdk.SysMLExtensions; +import org.openmbee.mdk.docgen.docbook.DBColSpec; +import org.openmbee.mdk.docgen.docbook.DBTable; +import org.openmbee.mdk.util.GeneratorUtils; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/model/TableStructure.java b/src/main/java/org/openmbee/mdk/model/TableStructure.java similarity index 97% rename from src/main/java/gov/nasa/jpl/mbee/mdk/model/TableStructure.java rename to src/main/java/org/openmbee/mdk/model/TableStructure.java index 7ef306483..adbda3dd0 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/model/TableStructure.java +++ b/src/main/java/org/openmbee/mdk/model/TableStructure.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.model; +package org.openmbee.mdk.model; import com.nomagic.magicdraw.core.Application; import com.nomagic.uml2.ext.magicdraw.actions.mdbasicactions.CallBehaviorAction; @@ -10,14 +10,14 @@ import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.EnumerationLiteral; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.NamedElement; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Property; -import gov.nasa.jpl.mbee.mdk.SysMLExtensions; -import gov.nasa.jpl.mbee.mdk.docgen.docbook.*; -import gov.nasa.jpl.mbee.mdk.generator.CollectFilterParser; -import gov.nasa.jpl.mbee.mdk.generator.DocumentGenerator; -import gov.nasa.jpl.mbee.mdk.docgen.ViewViewpointValidator; -import gov.nasa.jpl.mbee.mdk.generator.GenerationContext; -import gov.nasa.jpl.mbee.mdk.ocl.OclEvaluator; -import gov.nasa.jpl.mbee.mdk.util.*; +import org.openmbee.mdk.SysMLExtensions; +import org.openmbee.mdk.generator.CollectFilterParser; +import org.openmbee.mdk.generator.DocumentGenerator; +import org.openmbee.mdk.docgen.ViewViewpointValidator; +import org.openmbee.mdk.generator.GenerationContext; +import org.openmbee.mdk.ocl.OclEvaluator; +import org.openmbee.mdk.docgen.docbook.*; +import org.openmbee.mdk.util.*; import java.util.*; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/model/TemporalDiff.java b/src/main/java/org/openmbee/mdk/model/TemporalDiff.java similarity index 92% rename from src/main/java/gov/nasa/jpl/mbee/mdk/model/TemporalDiff.java rename to src/main/java/org/openmbee/mdk/model/TemporalDiff.java index 95565e19b..b16852aeb 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/model/TemporalDiff.java +++ b/src/main/java/org/openmbee/mdk/model/TemporalDiff.java @@ -1,14 +1,13 @@ -package gov.nasa.jpl.mbee.mdk.model; +package org.openmbee.mdk.model; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.EnumerationLiteral; -import gov.nasa.jpl.mbee.mdk.SysMLExtensions; -import gov.nasa.jpl.mbee.mdk.api.incubating.convert.Converters; -import gov.nasa.jpl.mbee.mdk.docgen.docbook.DBParagraph; -import gov.nasa.jpl.mbee.mdk.docgen.docbook.DocumentElement; -import gov.nasa.jpl.mbee.mdk.util.GeneratorUtils; -import gov.nasa.jpl.mbee.mdk.util.Utils; -import gov.nasa.jpl.mbee.mdk.util.Utils.AvailableAttribute; +import org.openmbee.mdk.SysMLExtensions; +import org.openmbee.mdk.api.incubating.convert.Converters; +import org.openmbee.mdk.docgen.docbook.DBParagraph; +import org.openmbee.mdk.docgen.docbook.DocumentElement; +import org.openmbee.mdk.util.GeneratorUtils; +import org.openmbee.mdk.util.Utils; import org.apache.commons.lang3.StringEscapeUtils; import java.util.ArrayList; @@ -30,7 +29,7 @@ public void initialize() { super.initialize(); SysMLExtensions.TemporalDiffStereotype s = profile.temporalDiff(); Object attr = GeneratorUtils.getStereotypePropertyFirst(dgElement, s.getDesiredAttributeProperty(), null); - AvailableAttribute attributeToCompare; + Utils.AvailableAttribute attributeToCompare; if (attr instanceof EnumerationLiteral) { attributeToCompare = Utils.AvailableAttribute.valueOf(((EnumerationLiteral) attr).getName()); } diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/model/TomSawyerDiagram.java b/src/main/java/org/openmbee/mdk/model/TomSawyerDiagram.java similarity index 85% rename from src/main/java/gov/nasa/jpl/mbee/mdk/model/TomSawyerDiagram.java rename to src/main/java/org/openmbee/mdk/model/TomSawyerDiagram.java index 6de2b2ca8..24985ce46 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/model/TomSawyerDiagram.java +++ b/src/main/java/org/openmbee/mdk/model/TomSawyerDiagram.java @@ -1,12 +1,12 @@ -package gov.nasa.jpl.mbee.mdk.model; +package org.openmbee.mdk.model; import com.nomagic.magicdraw.core.Application; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.EnumerationLiteral; -import gov.nasa.jpl.mbee.mdk.api.function.TriFunction; -import gov.nasa.jpl.mbee.mdk.api.incubating.convert.Converters; -import gov.nasa.jpl.mbee.mdk.docgen.docbook.DocumentElement; -import gov.nasa.jpl.mbee.mdk.util.GeneratorUtils; +import org.openmbee.mdk.api.function.TriFunction; +import org.openmbee.mdk.api.incubating.convert.Converters; +import org.openmbee.mdk.docgen.docbook.DocumentElement; +import org.openmbee.mdk.util.GeneratorUtils; import java.util.*; @@ -51,7 +51,7 @@ public List visit(boolean forViewEditor, String outputDir) { return Collections.emptyList(); } try { - TriFunction, TomSawyerDiagram.DiagramType, List> generator = (TriFunction, TomSawyerDiagram.DiagramType, List>) java.lang.Class.forName("gov.nasa.jpl.mbee.mdk.tomsawyer.api.DocumentElementGenerator").getConstructor().newInstance(); + TriFunction, DiagramType, List> generator = (TriFunction, TomSawyerDiagram.DiagramType, List>) java.lang.Class.forName("gov.nasa.jpl.mbee.mdk.tomsawyer.api.DocumentElementGenerator").getConstructor().newInstance(); return generator.apply(this, elements, diagramType); } catch (ReflectiveOperationException | ClassCastException e) { Application.getInstance().getGUILog().log("[WARNING] MDK DocGen Tom Sawyer plugin is not installed. TomSawyerDiagram DocGen activity skipped."); diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/model/UserScript.java b/src/main/java/org/openmbee/mdk/model/UserScript.java similarity index 92% rename from src/main/java/gov/nasa/jpl/mbee/mdk/model/UserScript.java rename to src/main/java/org/openmbee/mdk/model/UserScript.java index 34a718401..0e6f3a3a3 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/model/UserScript.java +++ b/src/main/java/org/openmbee/mdk/model/UserScript.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.model; +package org.openmbee.mdk.model; import com.nomagic.magicdraw.actions.MDAction; import com.nomagic.magicdraw.core.Application; @@ -8,16 +8,16 @@ import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.NamedElement; import com.nomagic.uml2.ext.magicdraw.mdprofiles.Stereotype; -import gov.nasa.jpl.mbee.mdk.docgen.DocGenUtils; -import gov.nasa.jpl.mbee.mdk.docgen.docbook.DBText; -import gov.nasa.jpl.mbee.mdk.docgen.docbook.DocumentElement; -import gov.nasa.jpl.mbee.mdk.docgen.validation.Suite; -import gov.nasa.jpl.mbee.mdk.docgen.view.ViewElement; -import gov.nasa.jpl.mbee.mdk.model.actions.RunUserEditableTableAction; -import gov.nasa.jpl.mbee.mdk.model.actions.RunUserScriptAction; -import gov.nasa.jpl.mbee.mdk.model.actions.RunUserValidationScriptAction; -import gov.nasa.jpl.mbee.mdk.util.ScriptRunner; -import gov.nasa.jpl.mbee.mdk.validation.ValidationSuite; +import org.openmbee.mdk.docgen.DocGenUtils; +import org.openmbee.mdk.docgen.docbook.DBText; +import org.openmbee.mdk.docgen.docbook.DocumentElement; +import org.openmbee.mdk.docgen.validation.Suite; +import org.openmbee.mdk.docgen.view.ViewElement; +import org.openmbee.mdk.model.actions.RunUserEditableTableAction; +import org.openmbee.mdk.model.actions.RunUserScriptAction; +import org.openmbee.mdk.model.actions.RunUserValidationScriptAction; +import org.openmbee.mdk.util.ScriptRunner; +import org.openmbee.mdk.validation.ValidationSuite; import javax.script.ScriptException; import java.io.PrintWriter; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/model/actions/EditPropertiesTableAction.java b/src/main/java/org/openmbee/mdk/model/actions/EditPropertiesTableAction.java similarity index 86% rename from src/main/java/gov/nasa/jpl/mbee/mdk/model/actions/EditPropertiesTableAction.java rename to src/main/java/org/openmbee/mdk/model/actions/EditPropertiesTableAction.java index 54487a254..af8fc4ae9 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/model/actions/EditPropertiesTableAction.java +++ b/src/main/java/org/openmbee/mdk/model/actions/EditPropertiesTableAction.java @@ -1,10 +1,10 @@ -package gov.nasa.jpl.mbee.mdk.model.actions; +package org.openmbee.mdk.model.actions; import com.nomagic.magicdraw.actions.MDAction; import com.nomagic.magicdraw.core.Application; import com.nomagic.magicdraw.core.GUILog; -import gov.nasa.jpl.mbee.mdk.docgen.table.EditableTable; -import gov.nasa.jpl.mbee.mdk.model.PropertiesTableByAttributes; +import org.openmbee.mdk.docgen.table.EditableTable; +import org.openmbee.mdk.model.PropertiesTableByAttributes; import java.awt.event.ActionEvent; import java.io.PrintWriter; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/model/actions/RunUserEditableTableAction.java b/src/main/java/org/openmbee/mdk/model/actions/RunUserEditableTableAction.java similarity index 85% rename from src/main/java/gov/nasa/jpl/mbee/mdk/model/actions/RunUserEditableTableAction.java rename to src/main/java/org/openmbee/mdk/model/actions/RunUserEditableTableAction.java index 21b26a846..e7a40b766 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/model/actions/RunUserEditableTableAction.java +++ b/src/main/java/org/openmbee/mdk/model/actions/RunUserEditableTableAction.java @@ -1,12 +1,12 @@ -package gov.nasa.jpl.mbee.mdk.model.actions; +package org.openmbee.mdk.model.actions; import com.nomagic.magicdraw.actions.MDAction; import com.nomagic.magicdraw.core.Application; import com.nomagic.magicdraw.core.GUILog; -import gov.nasa.jpl.mbee.mdk.docgen.DocGenViewDBSwitch; -import gov.nasa.jpl.mbee.mdk.docgen.table.EditableTable; -import gov.nasa.jpl.mbee.mdk.docgen.view.MDEditableTable; -import gov.nasa.jpl.mbee.mdk.model.UserScript; +import org.openmbee.mdk.docgen.DocGenViewDBSwitch; +import org.openmbee.mdk.docgen.table.EditableTable; +import org.openmbee.mdk.docgen.view.MDEditableTable; +import org.openmbee.mdk.model.UserScript; import java.awt.event.ActionEvent; import java.util.List; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/model/actions/RunUserScriptAction.java b/src/main/java/org/openmbee/mdk/model/actions/RunUserScriptAction.java similarity index 92% rename from src/main/java/gov/nasa/jpl/mbee/mdk/model/actions/RunUserScriptAction.java rename to src/main/java/org/openmbee/mdk/model/actions/RunUserScriptAction.java index ddebc39f6..aed533160 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/model/actions/RunUserScriptAction.java +++ b/src/main/java/org/openmbee/mdk/model/actions/RunUserScriptAction.java @@ -1,11 +1,11 @@ -package gov.nasa.jpl.mbee.mdk.model.actions; +package org.openmbee.mdk.model.actions; import com.nomagic.magicdraw.actions.MDAction; import com.nomagic.magicdraw.core.Application; import com.nomagic.magicdraw.core.GUILog; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.NamedElement; -import gov.nasa.jpl.mbee.mdk.docgen.view.ViewElement; -import gov.nasa.jpl.mbee.mdk.model.UserScript; +import org.openmbee.mdk.docgen.view.ViewElement; +import org.openmbee.mdk.model.UserScript; import java.awt.event.ActionEvent; import java.util.List; @@ -45,9 +45,9 @@ public void actionPerformed(ActionEvent event) { * for (Object key: o.keySet()) { try { log.log("key: " + * key.toString() + " value: " + o.get(key).toString()); } catch * (Exception e) { - * + * * } - * + * * } */ if (o.containsKey("docgenOutput")) { diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/model/actions/RunUserValidationScriptAction.java b/src/main/java/org/openmbee/mdk/model/actions/RunUserValidationScriptAction.java similarity index 90% rename from src/main/java/gov/nasa/jpl/mbee/mdk/model/actions/RunUserValidationScriptAction.java rename to src/main/java/org/openmbee/mdk/model/actions/RunUserValidationScriptAction.java index 7760bb714..918453aa2 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/model/actions/RunUserValidationScriptAction.java +++ b/src/main/java/org/openmbee/mdk/model/actions/RunUserValidationScriptAction.java @@ -1,13 +1,13 @@ -package gov.nasa.jpl.mbee.mdk.model.actions; +package org.openmbee.mdk.model.actions; import com.nomagic.magicdraw.actions.MDAction; import com.nomagic.magicdraw.core.Application; import com.nomagic.magicdraw.core.GUILog; -import gov.nasa.jpl.mbee.mdk.docgen.validation.Suite; -import gov.nasa.jpl.mbee.mdk.model.DocGenValidationDBSwitch; -import gov.nasa.jpl.mbee.mdk.model.UserScript; -import gov.nasa.jpl.mbee.mdk.util.Utils; -import gov.nasa.jpl.mbee.mdk.validation.ValidationSuite; +import org.openmbee.mdk.docgen.validation.Suite; +import org.openmbee.mdk.model.DocGenValidationDBSwitch; +import org.openmbee.mdk.model.UserScript; +import org.openmbee.mdk.util.Utils; +import org.openmbee.mdk.validation.ValidationSuite; import java.awt.event.ActionEvent; import java.util.ArrayList; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/model/docmeta/DocumentMeta.java b/src/main/java/org/openmbee/mdk/model/docmeta/DocumentMeta.java similarity index 99% rename from src/main/java/gov/nasa/jpl/mbee/mdk/model/docmeta/DocumentMeta.java rename to src/main/java/org/openmbee/mdk/model/docmeta/DocumentMeta.java index b4b8cceac..80611360b 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/model/docmeta/DocumentMeta.java +++ b/src/main/java/org/openmbee/mdk/model/docmeta/DocumentMeta.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.model.docmeta; +package org.openmbee.mdk.model.docmeta; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Diagram; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/model/docmeta/Person.java b/src/main/java/org/openmbee/mdk/model/docmeta/Person.java similarity index 95% rename from src/main/java/gov/nasa/jpl/mbee/mdk/model/docmeta/Person.java rename to src/main/java/org/openmbee/mdk/model/docmeta/Person.java index d48d64154..cf05be400 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/model/docmeta/Person.java +++ b/src/main/java/org/openmbee/mdk/model/docmeta/Person.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.model.docmeta; +package org.openmbee.mdk.model.docmeta; public class Person { diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/model/docmeta/Revision.java b/src/main/java/org/openmbee/mdk/model/docmeta/Revision.java similarity index 95% rename from src/main/java/gov/nasa/jpl/mbee/mdk/model/docmeta/Revision.java rename to src/main/java/org/openmbee/mdk/model/docmeta/Revision.java index 5a810b495..a5d88cc6f 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/model/docmeta/Revision.java +++ b/src/main/java/org/openmbee/mdk/model/docmeta/Revision.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.model.docmeta; +package org.openmbee.mdk.model.docmeta; public class Revision { diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/ocl/CallOperation.java b/src/main/java/org/openmbee/mdk/ocl/CallOperation.java similarity index 96% rename from src/main/java/gov/nasa/jpl/mbee/mdk/ocl/CallOperation.java rename to src/main/java/org/openmbee/mdk/ocl/CallOperation.java index 246afc329..503408910 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/ocl/CallOperation.java +++ b/src/main/java/org/openmbee/mdk/ocl/CallOperation.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.ocl; +package org.openmbee.mdk.ocl; /** * Function pointer interface to be used by custom OCL operations (basically diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/ocl/DocGenEnvironment.java b/src/main/java/org/openmbee/mdk/ocl/DocGenEnvironment.java similarity index 98% rename from src/main/java/gov/nasa/jpl/mbee/mdk/ocl/DocGenEnvironment.java rename to src/main/java/org/openmbee/mdk/ocl/DocGenEnvironment.java index 9f44b4d1d..f08ce0508 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/ocl/DocGenEnvironment.java +++ b/src/main/java/org/openmbee/mdk/ocl/DocGenEnvironment.java @@ -1,6 +1,6 @@ -package gov.nasa.jpl.mbee.mdk.ocl; +package org.openmbee.mdk.ocl; -import gov.nasa.jpl.mbee.mdk.util.Debug; +import org.openmbee.mdk.util.Debug; import org.eclipse.emf.ecore.*; import org.eclipse.emf.ecore.EcoreFactory; import org.eclipse.emf.ecore.resource.Resource; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/ocl/DocGenEnvironmentFactory.java b/src/main/java/org/openmbee/mdk/ocl/DocGenEnvironmentFactory.java similarity index 98% rename from src/main/java/gov/nasa/jpl/mbee/mdk/ocl/DocGenEnvironmentFactory.java rename to src/main/java/org/openmbee/mdk/ocl/DocGenEnvironmentFactory.java index fe546e52a..09565503a 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/ocl/DocGenEnvironmentFactory.java +++ b/src/main/java/org/openmbee/mdk/ocl/DocGenEnvironmentFactory.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.ocl; +package org.openmbee.mdk.ocl; /** * Following example from diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/ocl/DocGenEvaluationEnvironment.java b/src/main/java/org/openmbee/mdk/ocl/DocGenEvaluationEnvironment.java similarity index 97% rename from src/main/java/gov/nasa/jpl/mbee/mdk/ocl/DocGenEvaluationEnvironment.java rename to src/main/java/org/openmbee/mdk/ocl/DocGenEvaluationEnvironment.java index 3deaa649d..0e297b4ad 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/ocl/DocGenEvaluationEnvironment.java +++ b/src/main/java/org/openmbee/mdk/ocl/DocGenEvaluationEnvironment.java @@ -1,6 +1,6 @@ -package gov.nasa.jpl.mbee.mdk.ocl; +package org.openmbee.mdk.ocl; -import gov.nasa.jpl.mbee.mdk.util.Debug; +import org.openmbee.mdk.util.Debug; import org.eclipse.emf.ecore.*; import org.eclipse.ocl.EvaluationEnvironment; import org.eclipse.ocl.ecore.EcoreEnvironmentFactory; @@ -57,11 +57,11 @@ public void addDgOperation(DocGenOperation docGenOperation) { /* * (non-Javadoc) - * + * * @see * org.eclipse.ocl.ecore.EcoreEvaluationEnvironment#getJavaMethodFor(org * .eclipse.emf.ecore.EOperation, java.lang.Object) - * + * * This is overridden because the EString EClass instance wasn't mapping * it's Java instance class to String.class as it should, resulting in a * NullPointer exception diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/ocl/DocGenOperation.java b/src/main/java/org/openmbee/mdk/ocl/DocGenOperation.java similarity index 97% rename from src/main/java/gov/nasa/jpl/mbee/mdk/ocl/DocGenOperation.java rename to src/main/java/org/openmbee/mdk/ocl/DocGenOperation.java index 4a4b67100..61eb137a0 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/ocl/DocGenOperation.java +++ b/src/main/java/org/openmbee/mdk/ocl/DocGenOperation.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.ocl; +package org.openmbee.mdk.ocl; import org.eclipse.emf.ecore.EClassifier; import org.eclipse.emf.ecore.EParameter; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/ocl/DocGenOperationInstance.java b/src/main/java/org/openmbee/mdk/ocl/DocGenOperationInstance.java similarity index 97% rename from src/main/java/gov/nasa/jpl/mbee/mdk/ocl/DocGenOperationInstance.java rename to src/main/java/org/openmbee/mdk/ocl/DocGenOperationInstance.java index 509cf9ad3..3300c48dd 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/ocl/DocGenOperationInstance.java +++ b/src/main/java/org/openmbee/mdk/ocl/DocGenOperationInstance.java @@ -1,8 +1,8 @@ -package gov.nasa.jpl.mbee.mdk.ocl; +package org.openmbee.mdk.ocl; -import gov.nasa.jpl.mbee.mdk.util.CompareUtils; -import gov.nasa.jpl.mbee.mdk.util.Debug; -import gov.nasa.jpl.mbee.mdk.util.MoreToString; +import org.openmbee.mdk.util.CompareUtils; +import org.openmbee.mdk.util.Debug; +import org.openmbee.mdk.util.MoreToString; import org.eclipse.emf.ecore.EClassifier; import org.eclipse.emf.ecore.EParameter; import org.eclipse.ocl.ecore.internal.OCLStandardLibraryImpl; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/ocl/GetCallOperation.java b/src/main/java/org/openmbee/mdk/ocl/GetCallOperation.java similarity index 97% rename from src/main/java/gov/nasa/jpl/mbee/mdk/ocl/GetCallOperation.java rename to src/main/java/org/openmbee/mdk/ocl/GetCallOperation.java index f22ec423b..a289635f6 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/ocl/GetCallOperation.java +++ b/src/main/java/org/openmbee/mdk/ocl/GetCallOperation.java @@ -1,15 +1,15 @@ -package gov.nasa.jpl.mbee.mdk.ocl; +package org.openmbee.mdk.ocl; import com.nomagic.magicdraw.uml2.util.UML2ModelUtil; import com.nomagic.uml2.ext.jmi.helpers.StereotypesHelper; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.*; import com.nomagic.uml2.ext.magicdraw.mdprofiles.Stereotype; -import gov.nasa.jpl.mbee.mdk.docgen.DocGenUtils; -import gov.nasa.jpl.mbee.mdk.emf.EmfUtils; -import gov.nasa.jpl.mbee.mdk.util.CollectionAdder; -import gov.nasa.jpl.mbee.mdk.util.Utils; -import gov.nasa.jpl.mbee.mdk.util.Utils.AvailableAttribute; -import gov.nasa.jpl.mbee.mdk.util.Utils2; +import org.openmbee.mdk.docgen.DocGenUtils; +import org.openmbee.mdk.emf.EmfUtils; +import org.openmbee.mdk.util.CollectionAdder; +import org.openmbee.mdk.util.Utils; +import org.openmbee.mdk.util.Utils.AvailableAttribute; +import org.openmbee.mdk.util.Utils2; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EObject; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/ocl/OCLSyntaxHelper.java b/src/main/java/org/openmbee/mdk/ocl/OCLSyntaxHelper.java similarity index 96% rename from src/main/java/gov/nasa/jpl/mbee/mdk/ocl/OCLSyntaxHelper.java rename to src/main/java/org/openmbee/mdk/ocl/OCLSyntaxHelper.java index db6cb296e..838759546 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/ocl/OCLSyntaxHelper.java +++ b/src/main/java/org/openmbee/mdk/ocl/OCLSyntaxHelper.java @@ -1,6 +1,6 @@ -package gov.nasa.jpl.mbee.mdk.ocl; +package org.openmbee.mdk.ocl; -import gov.nasa.jpl.mbee.mdk.util.Debug; +import org.openmbee.mdk.util.Debug; import lpg.runtime.IToken; import org.eclipse.ocl.Environment; import org.eclipse.ocl.expressions.*; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/ocl/OclEvaluator.java b/src/main/java/org/openmbee/mdk/ocl/OclEvaluator.java similarity index 98% rename from src/main/java/gov/nasa/jpl/mbee/mdk/ocl/OclEvaluator.java rename to src/main/java/org/openmbee/mdk/ocl/OclEvaluator.java index 277240808..68e4db035 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/ocl/OclEvaluator.java +++ b/src/main/java/org/openmbee/mdk/ocl/OclEvaluator.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.ocl; +package org.openmbee.mdk.ocl; import com.nomagic.magicdraw.core.Application; import com.nomagic.magicdraw.core.Project; @@ -8,18 +8,18 @@ import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Class; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.*; import com.nomagic.uml2.ext.magicdraw.mdprofiles.Stereotype; -import gov.nasa.jpl.mbee.mdk.SysMLExtensions; -import gov.nasa.jpl.mbee.mdk.api.ElementFinder; -import gov.nasa.jpl.mbee.mdk.api.incubating.convert.Converters; -import gov.nasa.jpl.mbee.mdk.docgen.DocGenUtils; -import gov.nasa.jpl.mbee.mdk.generator.DocumentGenerator; -import gov.nasa.jpl.mbee.mdk.docgen.ViewViewpointValidator; -import gov.nasa.jpl.mbee.mdk.generator.ViewParser; -import gov.nasa.jpl.mbee.mdk.ocl.GetCallOperation.CallReturnType; -import gov.nasa.jpl.mbee.mdk.util.Debug; -import gov.nasa.jpl.mbee.mdk.util.GeneratorUtils; -import gov.nasa.jpl.mbee.mdk.util.Utils; -import gov.nasa.jpl.mbee.mdk.util.Utils2; +import org.openmbee.mdk.SysMLExtensions; +import org.openmbee.mdk.api.ElementFinder; +import org.openmbee.mdk.api.incubating.convert.Converters; +import org.openmbee.mdk.docgen.DocGenUtils; +import org.openmbee.mdk.generator.DocumentGenerator; +import org.openmbee.mdk.docgen.ViewViewpointValidator; +import org.openmbee.mdk.generator.ViewParser; +import org.openmbee.mdk.ocl.GetCallOperation.CallReturnType; +import org.openmbee.mdk.util.Debug; +import org.openmbee.mdk.util.GeneratorUtils; +import org.openmbee.mdk.util.Utils; +import org.openmbee.mdk.util.Utils2; import lpg.runtime.ParseTable; import org.eclipse.emf.common.util.BasicDiagnostic; import org.eclipse.emf.common.util.Diagnostic; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/ocl/actions/OclQueryAction.java b/src/main/java/org/openmbee/mdk/ocl/actions/OclQueryAction.java similarity index 95% rename from src/main/java/gov/nasa/jpl/mbee/mdk/ocl/actions/OclQueryAction.java rename to src/main/java/org/openmbee/mdk/ocl/actions/OclQueryAction.java index accfbc59c..83f66e54c 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/ocl/actions/OclQueryAction.java +++ b/src/main/java/org/openmbee/mdk/ocl/actions/OclQueryAction.java @@ -1,17 +1,17 @@ -package gov.nasa.jpl.mbee.mdk.ocl.actions; +package org.openmbee.mdk.ocl.actions; import com.nomagic.magicdraw.actions.MDAction; import com.nomagic.magicdraw.core.Application; import com.nomagic.magicdraw.uml.BaseElement; import com.nomagic.uml2.ext.magicdraw.base.ModelObject; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; -import gov.nasa.jpl.mbee.mdk.emf.EmfUtils; -import gov.nasa.jpl.mbee.mdk.ocl.OclEvaluator; -import gov.nasa.jpl.mbee.mdk.ocl.ui.OclQueryDialog; -import gov.nasa.jpl.mbee.mdk.ocl.ui.RepeatInputComboBoxDialog; -import gov.nasa.jpl.mbee.mdk.util.Debug; -import gov.nasa.jpl.mbee.mdk.util.MoreToString; -import gov.nasa.jpl.mbee.mdk.util.Utils2; +import org.openmbee.mdk.emf.EmfUtils; +import org.openmbee.mdk.ocl.OclEvaluator; +import org.openmbee.mdk.ocl.ui.OclQueryDialog; +import org.openmbee.mdk.ocl.ui.RepeatInputComboBoxDialog; +import org.openmbee.mdk.util.Debug; +import org.openmbee.mdk.util.MoreToString; +import org.openmbee.mdk.util.Utils2; import org.eclipse.emf.ecore.EObject; import org.eclipse.ocl.ParserException; @@ -120,7 +120,7 @@ public Object parseAndProcess(Object input) { //Debug.outln("completions = " + completions); return result; } - + /*@SuppressWarnings("rawtypes") public Object parseAndProcess(Object input) { String oclString = input == null ? null : input.toString(); @@ -192,7 +192,7 @@ public Object parseAndProcess(Object input) { // TODO } - + } return OclEvaluator.evaluateQuery(input, oclString, true); }*/ diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/ocl/ui/OclQueryDialog.java b/src/main/java/org/openmbee/mdk/ocl/ui/OclQueryDialog.java similarity index 98% rename from src/main/java/gov/nasa/jpl/mbee/mdk/ocl/ui/OclQueryDialog.java rename to src/main/java/org/openmbee/mdk/ocl/ui/OclQueryDialog.java index ca64bb1df..01a25a04b 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/ocl/ui/OclQueryDialog.java +++ b/src/main/java/org/openmbee/mdk/ocl/ui/OclQueryDialog.java @@ -1,10 +1,10 @@ -package gov.nasa.jpl.mbee.mdk.ocl.ui; +package org.openmbee.mdk.ocl.ui; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; -import gov.nasa.jpl.mbee.mdk.ocl.actions.OclQueryAction; -import gov.nasa.jpl.mbee.mdk.ocl.actions.OclQueryAction.ProcessOclQuery; -import gov.nasa.jpl.mbee.mdk.util.MDUtils; -import gov.nasa.jpl.mbee.mdk.util.MoreToString; +import org.openmbee.mdk.ocl.actions.OclQueryAction; +import org.openmbee.mdk.ocl.actions.OclQueryAction.ProcessOclQuery; +import org.openmbee.mdk.util.MDUtils; +import org.openmbee.mdk.util.MoreToString; import org.eclipse.ocl.util.CollectionUtil; import javax.swing.*; @@ -100,7 +100,7 @@ public void actionPerformed(ActionEvent e) { buttonPane.add(Box.createRigidArea(new Dimension(10, 0))); buttonPane.add(evalButton); - // checkboxes for which selected components to include: those in diagram, those in browser. + // checkboxes for which selected components to include: those in diagram, those in browser. JPanel checkBoxPane = new JPanel(); //checkBoxPane.setLayout( new BorderLayout() ); checkBoxPane.setLayout(new GridBagLayout()); diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/ocl/ui/RepeatInputComboBoxDialog.java b/src/main/java/org/openmbee/mdk/ocl/ui/RepeatInputComboBoxDialog.java similarity index 96% rename from src/main/java/gov/nasa/jpl/mbee/mdk/ocl/ui/RepeatInputComboBoxDialog.java rename to src/main/java/org/openmbee/mdk/ocl/ui/RepeatInputComboBoxDialog.java index a2411285f..66c47924a 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/ocl/ui/RepeatInputComboBoxDialog.java +++ b/src/main/java/org/openmbee/mdk/ocl/ui/RepeatInputComboBoxDialog.java @@ -1,9 +1,9 @@ -package gov.nasa.jpl.mbee.mdk.ocl.ui; +package org.openmbee.mdk.ocl.ui; -import gov.nasa.jpl.mbee.mdk.ocl.OclEvaluator; -import gov.nasa.jpl.mbee.mdk.util.Debug; -import gov.nasa.jpl.mbee.mdk.util.MoreToString; -import gov.nasa.jpl.mbee.mdk.util.Utils2; +import org.openmbee.mdk.ocl.OclEvaluator; +import org.openmbee.mdk.util.Debug; +import org.openmbee.mdk.util.MoreToString; +import org.openmbee.mdk.util.Utils2; import javax.swing.*; import javax.swing.event.AncestorEvent; @@ -372,7 +372,7 @@ public void itemStateChanged(ItemEvent e) { label = new JLabel(msg); resultLabel = new JLabel("Result of evaluation:"); // completionsLabel = new JLabel("Operations:"); - + resultPane = createEditorPane("
"); completionsPane = createEditorPane("
"); resultScrollPane = new JScrollPane(resultPane, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, @@ -383,9 +383,9 @@ public void itemStateChanged(ItemEvent e) { // completionsPane.add( completionsLabel ); // completionsPane.add( completionsScrollPane ); JSplitPane splitPane = new JSplitPane( JSplitPane.VERTICAL_SPLIT, resultScrollPane, completionsScrollPane ); - + final JTextArea textArea = new JTextArea(); - + add(label); add(jcb); add(textArea); @@ -396,11 +396,11 @@ public void itemStateChanged(ItemEvent e) { // putConstraint(e1, c1, pad, e2, c2): value(e1, c1) := value(e2, c2) + pad layout.putConstraint(SpringLayout.NORTH, label, 5, SpringLayout.NORTH, this); layout.putConstraint(SpringLayout.WEST, label, 5, SpringLayout.WEST, this); - + /*layout.putConstraint(SpringLayout.NORTH, jcb, 5, SpringLayout.SOUTH, label); layout.putConstraint(SpringLayout.WEST, jcb, 5, SpringLayout.WEST, this); layout.putConstraint(SpringLayout.EAST, jcb, -5, SpringLayout.EAST, this);* - + layout.putConstraint(SpringLayout.NORTH, textArea, 5, SpringLayout.SOUTH, label); layout.putConstraint(SpringLayout.WEST, textArea, 5, SpringLayout.WEST, this); layout.putConstraint(SpringLayout.EAST, textArea, -5, SpringLayout.EAST, this); @@ -408,7 +408,7 @@ public void itemStateChanged(ItemEvent e) { /*layout.putConstraint(SpringLayout.NORTH, resultLabel, 5, SpringLayout.SOUTH, jcb); layout.putConstraint(SpringLayout.WEST, resultLabel, 5, SpringLayout.WEST, this); layout.putConstraint(SpringLayout.EAST, resultLabel, -5, SpringLayout.EAST, this);* - + // layout.putConstraint(SpringLayout.NORTH, resultScrollPane, 5, SpringLayout.SOUTH, jcb); // layout.putConstraint(SpringLayout.WEST, resultScrollPane, 5, SpringLayout.WEST, this); // layout.putConstraint(SpringLayout.EAST, resultScrollPane, -5, SpringLayout.EAST, this); @@ -805,7 +805,7 @@ public static Window getWindow(Component component) { /* * Constructor that controls whether this listen can be used once or * multiple times. - * + * * @param removeListener when true this listener is only invoked once * otherwise it can be invoked multiple times. */ diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/options/ConfigureEnvironmentOptions.java b/src/main/java/org/openmbee/mdk/options/ConfigureEnvironmentOptions.java similarity index 88% rename from src/main/java/gov/nasa/jpl/mbee/mdk/options/ConfigureEnvironmentOptions.java rename to src/main/java/org/openmbee/mdk/options/ConfigureEnvironmentOptions.java index bef89f81a..554b2c913 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/options/ConfigureEnvironmentOptions.java +++ b/src/main/java/org/openmbee/mdk/options/ConfigureEnvironmentOptions.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.options; +package org.openmbee.mdk.options; import com.nomagic.magicdraw.core.Application; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/options/ConfigureProjectOptions.java b/src/main/java/org/openmbee/mdk/options/ConfigureProjectOptions.java similarity index 74% rename from src/main/java/gov/nasa/jpl/mbee/mdk/options/ConfigureProjectOptions.java rename to src/main/java/org/openmbee/mdk/options/ConfigureProjectOptions.java index f2c59eafd..a7c2f0636 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/options/ConfigureProjectOptions.java +++ b/src/main/java/org/openmbee/mdk/options/ConfigureProjectOptions.java @@ -1,9 +1,9 @@ -package gov.nasa.jpl.mbee.mdk.options; +package org.openmbee.mdk.options; import com.nomagic.magicdraw.core.Application; import com.nomagic.magicdraw.core.options.ProjectOptions; -import gov.nasa.jpl.mbee.mdk.MDKProjectOptionsConfigurator; -import gov.nasa.jpl.mbee.mdk.options.listener.MDKProjectEventListener; +import org.openmbee.mdk.MDKProjectOptionsConfigurator; +import org.openmbee.mdk.options.listener.MDKProjectEventListener; public class ConfigureProjectOptions { diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/options/MDKEnvironmentOptionsGroup.java b/src/main/java/org/openmbee/mdk/options/MDKEnvironmentOptionsGroup.java similarity index 94% rename from src/main/java/gov/nasa/jpl/mbee/mdk/options/MDKEnvironmentOptionsGroup.java rename to src/main/java/org/openmbee/mdk/options/MDKEnvironmentOptionsGroup.java index 6f6887fdc..519410363 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/options/MDKEnvironmentOptionsGroup.java +++ b/src/main/java/org/openmbee/mdk/options/MDKEnvironmentOptionsGroup.java @@ -1,10 +1,9 @@ -package gov.nasa.jpl.mbee.mdk.options; +package org.openmbee.mdk.options; -import com.nomagic.magicdraw.core.Application; import com.nomagic.magicdraw.core.options.AbstractPropertyOptionsGroup; import com.nomagic.magicdraw.properties.*; import com.nomagic.magicdraw.ui.ImageMap16; -import gov.nasa.jpl.mbee.mdk.util.MDUtils; +import org.openmbee.mdk.util.MDUtils; import javax.swing.*; import java.io.File; @@ -24,7 +23,7 @@ public class MDKEnvironmentOptionsGroup extends AbstractPropertyOptionsGroup { ENABLE_COORDINATED_SYNC_ID = "ENABLE_COORDINATED_SYNC_ID", CUSTOM_USER_SCRIPT_DIRECTORIES_ID = "CUSTOM_USER_SCRIPT_DIRECTORIES_ID", MMS_AUTHENTICATION_CHAIN = "MMS_AUTHENTICATION_CHAIN", - DOCBOOK_TO_PDF_STYLESHEET = "DOCBOOK_TO_PDF_STYLESHEET"; + DOCBOOK_TO_PDF_STYLESHEET = "DOCBOOK_TO_PDF_STYLESHEET"; public MDKEnvironmentOptionsGroup() { super(ID); @@ -134,20 +133,20 @@ public void setUserScriptDirectory(String path) { property.setGroup(GROUP); addProperty(property, true); } - - + + public String getDocBookToPDFStyleSheet() { Property p = getProperty(DOCBOOK_TO_PDF_STYLESHEET); return (String) p.getValue(); } - + public void setDocBookToPDFStyleSheet(String value) { FileProperty property = new FileProperty(DOCBOOK_TO_PDF_STYLESHEET, value, FileProperty.FILES_ONLY); property.setResourceProvider(PROPERTY_RESOURCE_PROVIDER); property.setGroup(GROUP); addProperty(property, true); } - + public List getAuthenticationChain() { String val = PROPERTY_RESOURCE_PROVIDER.getString(MMS_AUTHENTICATION_CHAIN, null); @@ -182,7 +181,7 @@ public void setDefaultValues() { setCoordinatedSyncEnabled(true); setUserScriptDirectory(""); setAuthenticationChain( - "gov.nasa.jpl.mbee.mdk.tickets.BasicAuthAcquireTicketProcessor,gov.nasa.jpl.mbee.mdk.tickets.AuthenticationChainError"); + "org.openmbee.mdk.tickets.BasicAuthAcquireTicketProcessor,org.openmbee.mdk.tickets.AuthenticationChainError"); setDocBookToPDFStyleSheet(""); } diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/options/MDKEnvironmentOptionsGroupResources.java b/src/main/java/org/openmbee/mdk/options/MDKEnvironmentOptionsGroupResources.java similarity index 79% rename from src/main/java/gov/nasa/jpl/mbee/mdk/options/MDKEnvironmentOptionsGroupResources.java rename to src/main/java/org/openmbee/mdk/options/MDKEnvironmentOptionsGroupResources.java index 8ced6e6b9..8dc585989 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/options/MDKEnvironmentOptionsGroupResources.java +++ b/src/main/java/org/openmbee/mdk/options/MDKEnvironmentOptionsGroupResources.java @@ -1,9 +1,9 @@ -package gov.nasa.jpl.mbee.mdk.options; +package org.openmbee.mdk.options; import com.nomagic.magicdraw.resources.ResourceManager; public class MDKEnvironmentOptionsGroupResources { - public static final String BUNDLE_NAME = "gov.nasa.jpl.mbee.mdk.options.EnvironmentOptionsResources"; + public static final String BUNDLE_NAME = "org.openmbee.mdk.options.EnvironmentOptionsResources"; /** * Constructs this resource handler. @@ -21,4 +21,4 @@ private MDKEnvironmentOptionsGroupResources() { public static String getString(String key) { return ResourceManager.getStringFor(key, BUNDLE_NAME, MDKEnvironmentOptionsGroupResources.class.getClassLoader()); } -} \ No newline at end of file +} diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/options/MDKProjectOptions.java b/src/main/java/org/openmbee/mdk/options/MDKProjectOptions.java similarity index 98% rename from src/main/java/gov/nasa/jpl/mbee/mdk/options/MDKProjectOptions.java rename to src/main/java/org/openmbee/mdk/options/MDKProjectOptions.java index feb1367fc..2c1fc1f7d 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/options/MDKProjectOptions.java +++ b/src/main/java/org/openmbee/mdk/options/MDKProjectOptions.java @@ -1,11 +1,10 @@ -package gov.nasa.jpl.mbee.mdk.options; +package org.openmbee.mdk.options; import com.nomagic.magicdraw.core.Application; import com.nomagic.magicdraw.core.Project; import com.nomagic.magicdraw.core.ProjectUtilities; import com.nomagic.magicdraw.core.options.ProjectOptions; import com.nomagic.magicdraw.properties.BooleanProperty; -import com.nomagic.magicdraw.properties.ElementListProperty; import com.nomagic.magicdraw.properties.Property; import com.nomagic.magicdraw.properties.StringProperty; import com.nomagic.uml2.ext.jmi.helpers.StereotypesHelper; @@ -14,8 +13,6 @@ import javax.swing.*; import java.net.URISyntaxException; -import java.util.ArrayList; -import java.util.List; import java.util.Optional; public class MDKProjectOptions { @@ -163,7 +160,7 @@ public static URIBuilder getMmsUrl(Project project) { Application.getInstance().getGUILog().log("[ERROR] You must enable MBEE Integration before continuing."); return null; } - + public static URIBuilder getVeUrl(Project project) { if (project == null) { return null; @@ -194,7 +191,7 @@ public static boolean isMigrationAllowed(Project project) { } /** - * @description + * @description * @param project * @throws IllegalStateException */ @@ -266,4 +263,4 @@ public static URIBuilder getUriBuilder(String urlString, String basePath) { } -} \ No newline at end of file +} diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/options/MDKProjectOptionsResources.java b/src/main/java/org/openmbee/mdk/options/MDKProjectOptionsResources.java similarity index 85% rename from src/main/java/gov/nasa/jpl/mbee/mdk/options/MDKProjectOptionsResources.java rename to src/main/java/org/openmbee/mdk/options/MDKProjectOptionsResources.java index fa2f184d3..8cd811879 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/options/MDKProjectOptionsResources.java +++ b/src/main/java/org/openmbee/mdk/options/MDKProjectOptionsResources.java @@ -1,11 +1,11 @@ -package gov.nasa.jpl.mbee.mdk.options; +package org.openmbee.mdk.options; import com.nomagic.magicdraw.resources.ResourceManager; import java.text.MessageFormat; public class MDKProjectOptionsResources { - public static final String BUNDLE_NAME = "gov.nasa.jpl.mbee.mdk.options.ProjectOptionsResources"; + public static final String BUNDLE_NAME = "org.openmbee.mdk.options.ProjectOptionsResources"; /** * Constructs this resource handler. @@ -30,4 +30,4 @@ public static String getStringFor(String var0, String... var1) { var2 = MessageFormat.format(var2, (Object[])var1); return var2; } -} \ No newline at end of file +} diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/options/MDKPropertyResourceProvider.java b/src/main/java/org/openmbee/mdk/options/MDKPropertyResourceProvider.java similarity index 94% rename from src/main/java/gov/nasa/jpl/mbee/mdk/options/MDKPropertyResourceProvider.java rename to src/main/java/org/openmbee/mdk/options/MDKPropertyResourceProvider.java index 134ad4a47..896bad203 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/options/MDKPropertyResourceProvider.java +++ b/src/main/java/org/openmbee/mdk/options/MDKPropertyResourceProvider.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.options; +package org.openmbee.mdk.options; import com.nomagic.magicdraw.properties.Property; import com.nomagic.magicdraw.properties.PropertyResourceProvider; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/options/listener/MDKProjectEventListener.java b/src/main/java/org/openmbee/mdk/options/listener/MDKProjectEventListener.java similarity index 94% rename from src/main/java/gov/nasa/jpl/mbee/mdk/options/listener/MDKProjectEventListener.java rename to src/main/java/org/openmbee/mdk/options/listener/MDKProjectEventListener.java index 4925832dc..4c9c241f7 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/options/listener/MDKProjectEventListener.java +++ b/src/main/java/org/openmbee/mdk/options/listener/MDKProjectEventListener.java @@ -1,11 +1,11 @@ -package gov.nasa.jpl.mbee.mdk.options.listener; +package org.openmbee.mdk.options.listener; import com.nomagic.ci.persistence.IProject; import com.nomagic.magicdraw.core.Project; import com.nomagic.magicdraw.core.ProjectUtilitiesInternal; import com.nomagic.magicdraw.core.project.ProjectEventListenerAdapter; import com.nomagic.magicdraw.core.project.ProjectPartLoadedListener; -import gov.nasa.jpl.mbee.mdk.options.MDKProjectOptions; +import org.openmbee.mdk.options.MDKProjectOptions; public class MDKProjectEventListener extends ProjectEventListenerAdapter implements ProjectPartLoadedListener { @@ -47,4 +47,4 @@ private static IllegalStateException InstanceNotFound(IllegalStateException var0 return var0; } -} \ No newline at end of file +} diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/options/listener/MDKProjectOptionsChangeListener.java b/src/main/java/org/openmbee/mdk/options/listener/MDKProjectOptionsChangeListener.java similarity index 88% rename from src/main/java/gov/nasa/jpl/mbee/mdk/options/listener/MDKProjectOptionsChangeListener.java rename to src/main/java/org/openmbee/mdk/options/listener/MDKProjectOptionsChangeListener.java index 7abaee806..f3945eaaa 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/options/listener/MDKProjectOptionsChangeListener.java +++ b/src/main/java/org/openmbee/mdk/options/listener/MDKProjectOptionsChangeListener.java @@ -1,9 +1,8 @@ -package gov.nasa.jpl.mbee.mdk.options.listener; +package org.openmbee.mdk.options.listener; import com.nomagic.magicdraw.core.Application; import com.nomagic.magicdraw.core.Project; -import com.nomagic.magicdraw.core.ProjectUtilities; -import gov.nasa.jpl.mbee.mdk.options.MDKProjectOptions; +import org.openmbee.mdk.options.MDKProjectOptions; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; @@ -44,4 +43,4 @@ private static IllegalStateException InstanceNotFound(IllegalStateException var0 return var0; } -} \ No newline at end of file +} diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/options/listener/MDKProjectPartLoadedListener.java b/src/main/java/org/openmbee/mdk/options/listener/MDKProjectPartLoadedListener.java similarity index 97% rename from src/main/java/gov/nasa/jpl/mbee/mdk/options/listener/MDKProjectPartLoadedListener.java rename to src/main/java/org/openmbee/mdk/options/listener/MDKProjectPartLoadedListener.java index 3517018ed..438c4f8b0 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/options/listener/MDKProjectPartLoadedListener.java +++ b/src/main/java/org/openmbee/mdk/options/listener/MDKProjectPartLoadedListener.java @@ -1,9 +1,7 @@ -package gov.nasa.jpl.mbee.mdk.options.listener; +package org.openmbee.mdk.options.listener; import com.nomagic.magicdraw.core.Application; -import java.beans.PropertyChangeEvent; - public class MDKProjectPartLoadedListener { private static MDKProjectPartLoadedListener INSTANCE; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/tickets/AbstractAcquireTicketProcessor.java b/src/main/java/org/openmbee/mdk/tickets/AbstractAcquireTicketProcessor.java similarity index 85% rename from src/main/java/gov/nasa/jpl/mbee/mdk/tickets/AbstractAcquireTicketProcessor.java rename to src/main/java/org/openmbee/mdk/tickets/AbstractAcquireTicketProcessor.java index abd593e8f..5e52e474a 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/tickets/AbstractAcquireTicketProcessor.java +++ b/src/main/java/org/openmbee/mdk/tickets/AbstractAcquireTicketProcessor.java @@ -1,10 +1,9 @@ -package gov.nasa.jpl.mbee.mdk.tickets; +package org.openmbee.mdk.tickets; import com.nomagic.magicdraw.core.Application; import com.nomagic.magicdraw.core.Project; -import gov.nasa.jpl.mbee.mdk.mms.MMSUtils; -import gov.nasa.jpl.mbee.mdk.options.MDKProjectOptions; +import org.openmbee.mdk.options.MDKProjectOptions; public abstract class AbstractAcquireTicketProcessor { private AbstractAcquireTicketProcessor processor; @@ -29,4 +28,4 @@ public void reset() { processor.reset(); } } -} \ No newline at end of file +} diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/tickets/AcquireTicketChain.java b/src/main/java/org/openmbee/mdk/tickets/AcquireTicketChain.java similarity index 94% rename from src/main/java/gov/nasa/jpl/mbee/mdk/tickets/AcquireTicketChain.java rename to src/main/java/org/openmbee/mdk/tickets/AcquireTicketChain.java index 9a8b77543..eedcaf6bb 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/tickets/AcquireTicketChain.java +++ b/src/main/java/org/openmbee/mdk/tickets/AcquireTicketChain.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.tickets; +package org.openmbee.mdk.tickets; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; @@ -6,11 +6,10 @@ import com.nomagic.magicdraw.core.Project; +import org.openmbee.mdk.options.MDKEnvironmentOptionsGroup; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import gov.nasa.jpl.mbee.mdk.options.MDKEnvironmentOptionsGroup; - public class AcquireTicketChain { AbstractAcquireTicketProcessor chain; private static final Logger logger = LoggerFactory.getLogger(AcquireTicketChain.class); @@ -47,4 +46,4 @@ public boolean acquireMmsTicket(Project project) { public void reset() { chain.reset(); } -} \ No newline at end of file +} diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/tickets/AuthenticationChainError.java b/src/main/java/org/openmbee/mdk/tickets/AuthenticationChainError.java similarity index 92% rename from src/main/java/gov/nasa/jpl/mbee/mdk/tickets/AuthenticationChainError.java rename to src/main/java/org/openmbee/mdk/tickets/AuthenticationChainError.java index 02ba19caf..401aaf4b5 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/tickets/AuthenticationChainError.java +++ b/src/main/java/org/openmbee/mdk/tickets/AuthenticationChainError.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.tickets; +package org.openmbee.mdk.tickets; import com.nomagic.magicdraw.core.Application; import com.nomagic.magicdraw.core.Project; @@ -13,4 +13,4 @@ public boolean acquireMmsTicket(Project project) { Application.getInstance().getGUILog().log("[ERROR] Unable to login to MMS with provided credentials."); return false; } -} \ No newline at end of file +} diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/tickets/BasicAuthAcquireTicketProcessor.java b/src/main/java/org/openmbee/mdk/tickets/BasicAuthAcquireTicketProcessor.java similarity index 94% rename from src/main/java/gov/nasa/jpl/mbee/mdk/tickets/BasicAuthAcquireTicketProcessor.java rename to src/main/java/org/openmbee/mdk/tickets/BasicAuthAcquireTicketProcessor.java index a18deebaf..509d8a8b4 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/tickets/BasicAuthAcquireTicketProcessor.java +++ b/src/main/java/org/openmbee/mdk/tickets/BasicAuthAcquireTicketProcessor.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.tickets; +package org.openmbee.mdk.tickets; import java.awt.GridLayout; import java.awt.event.FocusAdapter; @@ -24,18 +24,18 @@ import com.nomagic.task.ProgressStatus; import com.nomagic.ui.ProgressStatusRunner; -import gov.nasa.jpl.mbee.mdk.options.MDKProjectOptions; +import org.openmbee.mdk.options.MDKProjectOptions; import org.apache.http.client.methods.HttpRequestBase; -import gov.nasa.jpl.mbee.mdk.http.ServerException; -import gov.nasa.jpl.mbee.mdk.json.JacksonUtils; -import gov.nasa.jpl.mbee.mdk.mms.MMSUtils; -import gov.nasa.jpl.mbee.mdk.mms.actions.MMSLogoutAction; -import gov.nasa.jpl.mbee.mdk.mms.endpoints.MMSEndpointBuilderConstants; -import gov.nasa.jpl.mbee.mdk.mms.endpoints.MMSEndpointType; -import gov.nasa.jpl.mbee.mdk.mms.endpoints.MMSLoginEndpoint; -import gov.nasa.jpl.mbee.mdk.util.TicketUtils; -import gov.nasa.jpl.mbee.mdk.util.Utils; +import org.openmbee.mdk.http.ServerException; +import org.openmbee.mdk.json.JacksonUtils; +import org.openmbee.mdk.mms.MMSUtils; +import org.openmbee.mdk.mms.actions.MMSLogoutAction; +import org.openmbee.mdk.mms.endpoints.MMSEndpointBuilderConstants; +import org.openmbee.mdk.mms.endpoints.MMSEndpointType; +import org.openmbee.mdk.mms.endpoints.MMSLoginEndpoint; +import org.openmbee.mdk.util.TicketUtils; +import org.openmbee.mdk.util.Utils; public class BasicAuthAcquireTicketProcessor extends AbstractAcquireTicketProcessor { public BasicAuthAcquireTicketProcessor(AbstractAcquireTicketProcessor processor) { @@ -266,4 +266,4 @@ public void reset() { clearPassword(); super.reset(); } -} \ No newline at end of file +} diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/tickets/TWCAcquireTicketProcessor.java b/src/main/java/org/openmbee/mdk/tickets/TWCAcquireTicketProcessor.java similarity index 91% rename from src/main/java/gov/nasa/jpl/mbee/mdk/tickets/TWCAcquireTicketProcessor.java rename to src/main/java/org/openmbee/mdk/tickets/TWCAcquireTicketProcessor.java index 871eddf69..6ea901562 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/tickets/TWCAcquireTicketProcessor.java +++ b/src/main/java/org/openmbee/mdk/tickets/TWCAcquireTicketProcessor.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.tickets; +package org.openmbee.mdk.tickets; import java.io.IOException; import java.net.ConnectException; @@ -14,16 +14,16 @@ import com.nomagic.ui.ProgressStatusRunner; import org.apache.http.client.methods.HttpRequestBase; +import org.openmbee.mdk.api.incubating.MDKConstants; +import org.openmbee.mdk.http.ServerException; +import org.openmbee.mdk.mms.endpoints.MMSEndpointType; +import org.openmbee.mdk.mms.endpoints.MMSTWCLoginEndpoint; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import gov.nasa.jpl.mbee.mdk.api.incubating.MDKConstants; -import gov.nasa.jpl.mbee.mdk.http.ServerException; -import gov.nasa.jpl.mbee.mdk.json.JacksonUtils; -import gov.nasa.jpl.mbee.mdk.mms.MMSUtils; -import gov.nasa.jpl.mbee.mdk.mms.endpoints.MMSEndpointType; -import gov.nasa.jpl.mbee.mdk.mms.endpoints.MMSTWCLoginEndpoint; -import gov.nasa.jpl.mbee.mdk.util.TicketUtils; +import org.openmbee.mdk.json.JacksonUtils; +import org.openmbee.mdk.mms.MMSUtils; +import org.openmbee.mdk.util.TicketUtils; public class TWCAcquireTicketProcessor extends AbstractAcquireTicketProcessor { public TWCAcquireTicketProcessor(AbstractAcquireTicketProcessor processor) { @@ -114,4 +114,4 @@ public boolean acquireMmsTicket(Project project) { public void reset() { super.reset(); } -} \ No newline at end of file +} diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/ui/ViewEditorLinkForm.form b/src/main/java/org/openmbee/mdk/ui/ViewEditorLinkForm.form similarity index 96% rename from src/main/java/gov/nasa/jpl/mbee/mdk/ui/ViewEditorLinkForm.form rename to src/main/java/org/openmbee/mdk/ui/ViewEditorLinkForm.form index 2c4c26c74..4b1c14ca3 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/ui/ViewEditorLinkForm.form +++ b/src/main/java/org/openmbee/mdk/ui/ViewEditorLinkForm.form @@ -1,5 +1,5 @@ - + diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/ui/ViewEditorLinkForm.java b/src/main/java/org/openmbee/mdk/ui/ViewEditorLinkForm.java similarity index 98% rename from src/main/java/gov/nasa/jpl/mbee/mdk/ui/ViewEditorLinkForm.java rename to src/main/java/org/openmbee/mdk/ui/ViewEditorLinkForm.java index f409998d4..94d60949d 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/ui/ViewEditorLinkForm.java +++ b/src/main/java/org/openmbee/mdk/ui/ViewEditorLinkForm.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.ui; +package org.openmbee.mdk.ui; import com.nomagic.magicdraw.core.Application; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/util/Changelog.java b/src/main/java/org/openmbee/mdk/util/Changelog.java similarity index 99% rename from src/main/java/gov/nasa/jpl/mbee/mdk/util/Changelog.java rename to src/main/java/org/openmbee/mdk/util/Changelog.java index 3fd7c0f28..3ecde141e 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/util/Changelog.java +++ b/src/main/java/org/openmbee/mdk/util/Changelog.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.util; +package org.openmbee.mdk.util; import com.nomagic.magicdraw.core.Application; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.NamedElement; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/util/ClassUtils.java b/src/main/java/org/openmbee/mdk/util/ClassUtils.java similarity index 96% rename from src/main/java/gov/nasa/jpl/mbee/mdk/util/ClassUtils.java rename to src/main/java/org/openmbee/mdk/util/ClassUtils.java index d05533d07..ce1ebd33a 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/util/ClassUtils.java +++ b/src/main/java/org/openmbee/mdk/util/ClassUtils.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.util; +package org.openmbee.mdk.util; import java.lang.reflect.*; import java.util.*; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/util/CollectionAdder.java b/src/main/java/org/openmbee/mdk/util/CollectionAdder.java similarity index 99% rename from src/main/java/gov/nasa/jpl/mbee/mdk/util/CollectionAdder.java rename to src/main/java/org/openmbee/mdk/util/CollectionAdder.java index 5942a7422..b5619a0e3 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/util/CollectionAdder.java +++ b/src/main/java/org/openmbee/mdk/util/CollectionAdder.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.util; +package org.openmbee.mdk.util; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/util/CompareUtils.java b/src/main/java/org/openmbee/mdk/util/CompareUtils.java similarity index 96% rename from src/main/java/gov/nasa/jpl/mbee/mdk/util/CompareUtils.java rename to src/main/java/org/openmbee/mdk/util/CompareUtils.java index 2092b0724..81c30f3d5 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/util/CompareUtils.java +++ b/src/main/java/org/openmbee/mdk/util/CompareUtils.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.util; +package org.openmbee.mdk.util; // import gov.nasa.jpl.ae.solver.HasId; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/util/Debug.java b/src/main/java/org/openmbee/mdk/util/Debug.java similarity index 95% rename from src/main/java/gov/nasa/jpl/mbee/mdk/util/Debug.java rename to src/main/java/org/openmbee/mdk/util/Debug.java index 9039f5376..dcb3677d3 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/util/Debug.java +++ b/src/main/java/org/openmbee/mdk/util/Debug.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.util; +package org.openmbee.mdk.util; import java.awt.*; import java.io.PrintWriter; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/util/DependencyMatrixTool.java b/src/main/java/org/openmbee/mdk/util/DependencyMatrixTool.java similarity index 98% rename from src/main/java/gov/nasa/jpl/mbee/mdk/util/DependencyMatrixTool.java rename to src/main/java/org/openmbee/mdk/util/DependencyMatrixTool.java index 64e54984a..21bde5626 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/util/DependencyMatrixTool.java +++ b/src/main/java/org/openmbee/mdk/util/DependencyMatrixTool.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.util; +package org.openmbee.mdk.util; import com.nomagic.annotation.OpenApiAll; import com.nomagic.magicdraw.core.Application; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/util/GeneratorUtils.java b/src/main/java/org/openmbee/mdk/util/GeneratorUtils.java similarity index 97% rename from src/main/java/gov/nasa/jpl/mbee/mdk/util/GeneratorUtils.java rename to src/main/java/org/openmbee/mdk/util/GeneratorUtils.java index 5dcae993d..a33333a46 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/util/GeneratorUtils.java +++ b/src/main/java/org/openmbee/mdk/util/GeneratorUtils.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.util; +package org.openmbee.mdk.util; import com.nomagic.magicdraw.core.Project; import com.nomagic.magicdraw.sysml.util.SysMLProfile; @@ -9,11 +9,11 @@ import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.*; import com.nomagic.uml2.ext.magicdraw.commonbehaviors.mdbasicbehaviors.Behavior; import com.nomagic.uml2.ext.magicdraw.mdprofiles.Stereotype; -import gov.nasa.jpl.mbee.mdk.SysMLExtensions; -import gov.nasa.jpl.mbee.mdk.model.Document; -import gov.nasa.jpl.mbee.mdk.model.docmeta.DocumentMeta; -import gov.nasa.jpl.mbee.mdk.model.docmeta.Person; -import gov.nasa.jpl.mbee.mdk.model.docmeta.Revision; +import org.openmbee.mdk.SysMLExtensions; +import org.openmbee.mdk.model.Document; +import org.openmbee.mdk.model.docmeta.DocumentMeta; +import org.openmbee.mdk.model.docmeta.Person; +import org.openmbee.mdk.model.docmeta.Revision; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/util/MDUtils.java b/src/main/java/org/openmbee/mdk/util/MDUtils.java similarity index 99% rename from src/main/java/gov/nasa/jpl/mbee/mdk/util/MDUtils.java rename to src/main/java/org/openmbee/mdk/util/MDUtils.java index a875d5706..f815d2e08 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/util/MDUtils.java +++ b/src/main/java/org/openmbee/mdk/util/MDUtils.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.util; +package org.openmbee.mdk.util; import com.nomagic.magicdraw.core.Application; import com.nomagic.magicdraw.core.Project; @@ -11,7 +11,7 @@ import com.nomagic.magicdraw.uml.symbols.DiagramPresentationElement; import com.nomagic.magicdraw.uml.symbols.PresentationElement; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; -import gov.nasa.jpl.mbee.mdk.docgen.DocGenUtils; +import org.openmbee.mdk.docgen.DocGenUtils; import org.apache.batik.anim.dom.SAXSVGDocumentFactory; import org.apache.batik.util.XMLResourceDescriptor; import org.w3c.dom.Document; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/util/MatrixUtil.java b/src/main/java/org/openmbee/mdk/util/MatrixUtil.java similarity index 98% rename from src/main/java/gov/nasa/jpl/mbee/mdk/util/MatrixUtil.java rename to src/main/java/org/openmbee/mdk/util/MatrixUtil.java index ef60ccdcd..a4e21dcf6 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/util/MatrixUtil.java +++ b/src/main/java/org/openmbee/mdk/util/MatrixUtil.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.util; +package org.openmbee.mdk.util; import com.nomagic.annotation.InternalApi; import com.nomagic.annotation.OpenApiAll; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/util/MdDebug.java b/src/main/java/org/openmbee/mdk/util/MdDebug.java similarity index 98% rename from src/main/java/gov/nasa/jpl/mbee/mdk/util/MdDebug.java rename to src/main/java/org/openmbee/mdk/util/MdDebug.java index fc27c276d..317092dc5 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/util/MdDebug.java +++ b/src/main/java/org/openmbee/mdk/util/MdDebug.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.util; +package org.openmbee.mdk.util; import com.nomagic.magicdraw.core.Application; import com.nomagic.magicdraw.core.GUILog; @@ -145,7 +145,7 @@ protected static boolean isGuiThread() { public static void logUnsafe(final String s, final boolean addNewLine, final boolean isErr, final Color color) { - if (!Debug.isOn()) { + if (!isOn()) { return; } } @@ -207,7 +207,7 @@ public static void log(final String s, final boolean addNewLine, final boolean i } public static void log(final String s, final boolean addNewLine, final boolean isErr, final Color color) { - if (!Debug.on) { + if (!on) { return; } logForce(s, addNewLine, isErr, color); diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/util/MoreToString.java b/src/main/java/org/openmbee/mdk/util/MoreToString.java similarity index 99% rename from src/main/java/gov/nasa/jpl/mbee/mdk/util/MoreToString.java rename to src/main/java/org/openmbee/mdk/util/MoreToString.java index faa5ee6dd..67ce1c8fe 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/util/MoreToString.java +++ b/src/main/java/org/openmbee/mdk/util/MoreToString.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.util; +package org.openmbee.mdk.util; import org.junit.Assert; import org.junit.Test; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/util/Pair.java b/src/main/java/org/openmbee/mdk/util/Pair.java similarity index 98% rename from src/main/java/gov/nasa/jpl/mbee/mdk/util/Pair.java rename to src/main/java/org/openmbee/mdk/util/Pair.java index 45bf75a14..fda4193bf 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/util/Pair.java +++ b/src/main/java/org/openmbee/mdk/util/Pair.java @@ -22,7 +22,7 @@ * */ -package gov.nasa.jpl.mbee.mdk.util; +package org.openmbee.mdk.util; import java.io.Serializable; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/util/ScriptRunner.java b/src/main/java/org/openmbee/mdk/util/ScriptRunner.java similarity index 98% rename from src/main/java/gov/nasa/jpl/mbee/mdk/util/ScriptRunner.java rename to src/main/java/org/openmbee/mdk/util/ScriptRunner.java index d641d30c5..8de518d0a 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/util/ScriptRunner.java +++ b/src/main/java/org/openmbee/mdk/util/ScriptRunner.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.util; +package org.openmbee.mdk.util; import com.nomagic.magicdraw.automaton.AutomatonPlugin; import com.nomagic.magicdraw.core.Application; @@ -14,8 +14,8 @@ import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.NamedElement; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Property; import com.nomagic.uml2.ext.magicdraw.mdprofiles.Stereotype; -import gov.nasa.jpl.mbee.mdk.SysMLExtensions; -import gov.nasa.jpl.mbee.mdk.options.MDKEnvironmentOptionsGroup; +import org.openmbee.mdk.SysMLExtensions; +import org.openmbee.mdk.options.MDKEnvironmentOptionsGroup; import javax.script.*; import java.io.File; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/util/SeenHashSet.java b/src/main/java/org/openmbee/mdk/util/SeenHashSet.java similarity index 92% rename from src/main/java/gov/nasa/jpl/mbee/mdk/util/SeenHashSet.java rename to src/main/java/org/openmbee/mdk/util/SeenHashSet.java index 77afa448c..67827198a 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/util/SeenHashSet.java +++ b/src/main/java/org/openmbee/mdk/util/SeenHashSet.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.util; +package org.openmbee.mdk.util; import java.util.Collection; import java.util.HashSet; @@ -14,7 +14,7 @@ public class SeenHashSet extends HashSet implements SeenSet { /* * (non-Javadoc) - * + * * @see gov.nasa.jpl.ae.util.SeenSet#seen(java.lang.Object, boolean) */ @Override diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/util/SeenSet.java b/src/main/java/org/openmbee/mdk/util/SeenSet.java similarity index 94% rename from src/main/java/gov/nasa/jpl/mbee/mdk/util/SeenSet.java rename to src/main/java/org/openmbee/mdk/util/SeenSet.java index 2b909df64..3122109c9 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/util/SeenSet.java +++ b/src/main/java/org/openmbee/mdk/util/SeenSet.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.util; +package org.openmbee.mdk.util; import java.util.Set; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/util/TaskRunner.java b/src/main/java/org/openmbee/mdk/util/TaskRunner.java similarity index 99% rename from src/main/java/gov/nasa/jpl/mbee/mdk/util/TaskRunner.java rename to src/main/java/org/openmbee/mdk/util/TaskRunner.java index 8c67c80dd..7c79a4e53 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/util/TaskRunner.java +++ b/src/main/java/org/openmbee/mdk/util/TaskRunner.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.util; +package org.openmbee.mdk.util; import com.nomagic.magicdraw.cookies.CloseCookie; import com.nomagic.magicdraw.core.Application; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/util/TicketUtils.java b/src/main/java/org/openmbee/mdk/util/TicketUtils.java similarity index 94% rename from src/main/java/gov/nasa/jpl/mbee/mdk/util/TicketUtils.java rename to src/main/java/org/openmbee/mdk/util/TicketUtils.java index d063de649..da700cb7e 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/util/TicketUtils.java +++ b/src/main/java/org/openmbee/mdk/util/TicketUtils.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.util; +package org.openmbee.mdk.util; import java.io.IOException; import java.net.URISyntaxException; @@ -13,10 +13,10 @@ import com.nomagic.magicdraw.core.Project; import com.nomagic.task.ProgressStatus; -import gov.nasa.jpl.mbee.mdk.http.ServerException; -import gov.nasa.jpl.mbee.mdk.mms.MMSUtils; -import gov.nasa.jpl.mbee.mdk.mms.actions.MMSLogoutAction; -import gov.nasa.jpl.mbee.mdk.tickets.AcquireTicketChain; +import org.openmbee.mdk.http.ServerException; +import org.openmbee.mdk.mms.MMSUtils; +import org.openmbee.mdk.mms.actions.MMSLogoutAction; +import org.openmbee.mdk.tickets.AcquireTicketChain; public class TicketUtils { private static final int TICKET_RENEWAL_INTERVAL = 15 * 60; // seconds diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/util/Utils.java b/src/main/java/org/openmbee/mdk/util/Utils.java similarity index 99% rename from src/main/java/gov/nasa/jpl/mbee/mdk/util/Utils.java rename to src/main/java/org/openmbee/mdk/util/Utils.java index 82bc8f0fc..db8ea202c 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/util/Utils.java +++ b/src/main/java/org/openmbee/mdk/util/Utils.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.util; +package org.openmbee.mdk.util; import com.nomagic.actions.NMAction; import com.nomagic.magicdraw.annotation.Annotation; @@ -27,21 +27,21 @@ import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Package; import com.nomagic.uml2.ext.magicdraw.mdprofiles.Stereotype; import com.nomagic.uml2.impl.ElementsFactory; -import gov.nasa.jpl.mbee.mdk.api.incubating.MDKConstants; -import gov.nasa.jpl.mbee.mdk.api.incubating.convert.Converters; -import gov.nasa.jpl.mbee.mdk.docgen.DocGenUtils; -import gov.nasa.jpl.mbee.mdk.docgen.docbook.*; -import gov.nasa.jpl.mbee.mdk.docgen.table.EditableTable; -import gov.nasa.jpl.mbee.mdk.docgen.table.EditableTableModel; -import gov.nasa.jpl.mbee.mdk.docgen.table.PropertyEnum; -import gov.nasa.jpl.mbee.mdk.emf.EmfUtils; -import gov.nasa.jpl.mbee.mdk.generator.CollectFilterParser; -import gov.nasa.jpl.mbee.mdk.docgen.ViewViewpointValidator; -import gov.nasa.jpl.mbee.mdk.mms.sync.local.LocalDeltaProjectEventListenerAdapter; -import gov.nasa.jpl.mbee.mdk.mms.sync.local.LocalDeltaTransactionCommitListener; - -import gov.nasa.jpl.mbee.mdk.ocl.OclEvaluator; -import gov.nasa.jpl.mbee.mdk.validation.*; +import org.openmbee.mdk.api.incubating.MDKConstants; +import org.openmbee.mdk.api.incubating.convert.Converters; +import org.openmbee.mdk.docgen.DocGenUtils; +import org.openmbee.mdk.docgen.table.EditableTable; +import org.openmbee.mdk.docgen.table.EditableTableModel; +import org.openmbee.mdk.docgen.table.PropertyEnum; +import org.openmbee.mdk.emf.EmfUtils; +import org.openmbee.mdk.generator.CollectFilterParser; +import org.openmbee.mdk.docgen.ViewViewpointValidator; +import org.openmbee.mdk.mms.sync.local.LocalDeltaProjectEventListenerAdapter; +import org.openmbee.mdk.mms.sync.local.LocalDeltaTransactionCommitListener; + +import org.openmbee.mdk.ocl.OclEvaluator; +import org.openmbee.mdk.docgen.docbook.*; +import org.openmbee.mdk.validation.*; import javax.annotation.CheckForNull; import javax.swing.*; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/util/Utils2.java b/src/main/java/org/openmbee/mdk/util/Utils2.java similarity index 96% rename from src/main/java/gov/nasa/jpl/mbee/mdk/util/Utils2.java rename to src/main/java/org/openmbee/mdk/util/Utils2.java index 695e0dc18..004aa903d 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/util/Utils2.java +++ b/src/main/java/org/openmbee/mdk/util/Utils2.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.util; +package org.openmbee.mdk.util; import java.util.*; import java.util.regex.Matcher; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/util/XMLUtil.java b/src/main/java/org/openmbee/mdk/util/XMLUtil.java similarity index 95% rename from src/main/java/gov/nasa/jpl/mbee/mdk/util/XMLUtil.java rename to src/main/java/org/openmbee/mdk/util/XMLUtil.java index 4b6979e56..ad560632c 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/util/XMLUtil.java +++ b/src/main/java/org/openmbee/mdk/util/XMLUtil.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.util; +package org.openmbee.mdk.util; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -28,4 +28,4 @@ public int size() { return list.getLength(); } } -} \ No newline at end of file +} diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/validation/GenericRuleViolationAction.java b/src/main/java/org/openmbee/mdk/validation/GenericRuleViolationAction.java similarity index 98% rename from src/main/java/gov/nasa/jpl/mbee/mdk/validation/GenericRuleViolationAction.java rename to src/main/java/org/openmbee/mdk/validation/GenericRuleViolationAction.java index 41d0ed892..31088c1a5 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/validation/GenericRuleViolationAction.java +++ b/src/main/java/org/openmbee/mdk/validation/GenericRuleViolationAction.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.validation; +package org.openmbee.mdk.validation; import com.nomagic.actions.NMAction; import com.nomagic.magicdraw.annotation.Annotation; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/validation/IRuleViolationAction.java b/src/main/java/org/openmbee/mdk/validation/IRuleViolationAction.java similarity index 88% rename from src/main/java/gov/nasa/jpl/mbee/mdk/validation/IRuleViolationAction.java rename to src/main/java/org/openmbee/mdk/validation/IRuleViolationAction.java index 962bcd26f..a5656593e 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/validation/IRuleViolationAction.java +++ b/src/main/java/org/openmbee/mdk/validation/IRuleViolationAction.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.validation; +package org.openmbee.mdk.validation; import com.nomagic.magicdraw.annotation.Annotation; import com.nomagic.magicdraw.validation.RuleViolationResult; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/validation/IndeterminateProgressMonitorProxy.java b/src/main/java/org/openmbee/mdk/validation/IndeterminateProgressMonitorProxy.java similarity index 99% rename from src/main/java/gov/nasa/jpl/mbee/mdk/validation/IndeterminateProgressMonitorProxy.java rename to src/main/java/org/openmbee/mdk/validation/IndeterminateProgressMonitorProxy.java index 74a51cba8..b26578096 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/validation/IndeterminateProgressMonitorProxy.java +++ b/src/main/java/org/openmbee/mdk/validation/IndeterminateProgressMonitorProxy.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.validation; +package org.openmbee.mdk.validation; import com.nomagic.magicdraw.annotation.Annotation; import com.nomagic.magicdraw.core.Application; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/validation/RuleViolationAction.java b/src/main/java/org/openmbee/mdk/validation/RuleViolationAction.java similarity index 95% rename from src/main/java/gov/nasa/jpl/mbee/mdk/validation/RuleViolationAction.java rename to src/main/java/org/openmbee/mdk/validation/RuleViolationAction.java index fd1fd5e4d..782fcd692 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/validation/RuleViolationAction.java +++ b/src/main/java/org/openmbee/mdk/validation/RuleViolationAction.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.validation; +package org.openmbee.mdk.validation; import com.nomagic.magicdraw.actions.MDAction; import com.nomagic.magicdraw.annotation.Annotation; @@ -8,9 +8,9 @@ import com.nomagic.magicdraw.openapi.uml.ReadOnlyElementException; import com.nomagic.magicdraw.openapi.uml.SessionManager; import com.nomagic.magicdraw.validation.RuleViolationResult; -import gov.nasa.jpl.mbee.mdk.mms.sync.local.LocalDeltaProjectEventListenerAdapter; -import gov.nasa.jpl.mbee.mdk.mms.sync.local.LocalDeltaTransactionCommitListener; -import gov.nasa.jpl.mbee.mdk.util.Utils; +import org.openmbee.mdk.mms.sync.local.LocalDeltaProjectEventListenerAdapter; +import org.openmbee.mdk.mms.sync.local.LocalDeltaTransactionCommitListener; +import org.openmbee.mdk.util.Utils; import javax.swing.*; import java.util.Collection; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/validation/ValidationRule.java b/src/main/java/org/openmbee/mdk/validation/ValidationRule.java similarity index 97% rename from src/main/java/gov/nasa/jpl/mbee/mdk/validation/ValidationRule.java rename to src/main/java/org/openmbee/mdk/validation/ValidationRule.java index 3e1d2cf3e..2ee14a15b 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/validation/ValidationRule.java +++ b/src/main/java/org/openmbee/mdk/validation/ValidationRule.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.validation; +package org.openmbee.mdk.validation; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/validation/ValidationRuleViolation.java b/src/main/java/org/openmbee/mdk/validation/ValidationRuleViolation.java similarity index 96% rename from src/main/java/gov/nasa/jpl/mbee/mdk/validation/ValidationRuleViolation.java rename to src/main/java/org/openmbee/mdk/validation/ValidationRuleViolation.java index a3d055ddb..f2ad46a76 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/validation/ValidationRuleViolation.java +++ b/src/main/java/org/openmbee/mdk/validation/ValidationRuleViolation.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.validation; +package org.openmbee.mdk.validation; import com.nomagic.actions.NMAction; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/validation/ValidationSuite.java b/src/main/java/org/openmbee/mdk/validation/ValidationSuite.java similarity index 98% rename from src/main/java/gov/nasa/jpl/mbee/mdk/validation/ValidationSuite.java rename to src/main/java/org/openmbee/mdk/validation/ValidationSuite.java index 7de15be21..a68204290 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/validation/ValidationSuite.java +++ b/src/main/java/org/openmbee/mdk/validation/ValidationSuite.java @@ -1,7 +1,7 @@ -package gov.nasa.jpl.mbee.mdk.validation; +package org.openmbee.mdk.validation; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.NamedElement; -import gov.nasa.jpl.mbee.mdk.docgen.docbook.*; +import org.openmbee.mdk.docgen.docbook.*; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/validation/ValidationWindowRun.java b/src/main/java/org/openmbee/mdk/validation/ValidationWindowRun.java similarity index 94% rename from src/main/java/gov/nasa/jpl/mbee/mdk/validation/ValidationWindowRun.java rename to src/main/java/org/openmbee/mdk/validation/ValidationWindowRun.java index d839ad6dd..1b08ea14a 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/validation/ValidationWindowRun.java +++ b/src/main/java/org/openmbee/mdk/validation/ValidationWindowRun.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.validation; +package org.openmbee.mdk.validation; import com.nomagic.magicdraw.annotation.Annotation; import com.nomagic.magicdraw.validation.RuleViolationResult; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/validation/ViolationSeverity.java b/src/main/java/org/openmbee/mdk/validation/ViolationSeverity.java similarity index 63% rename from src/main/java/gov/nasa/jpl/mbee/mdk/validation/ViolationSeverity.java rename to src/main/java/org/openmbee/mdk/validation/ViolationSeverity.java index 49bc84a2f..dc9db91b6 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/validation/ViolationSeverity.java +++ b/src/main/java/org/openmbee/mdk/validation/ViolationSeverity.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.validation; +package org.openmbee.mdk.validation; public enum ViolationSeverity { WARNING, ERROR, INFO, FATAL, DEBUG diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/viewedit/DBAlfrescoListVisitor.java b/src/main/java/org/openmbee/mdk/viewedit/DBAlfrescoListVisitor.java similarity index 96% rename from src/main/java/gov/nasa/jpl/mbee/mdk/viewedit/DBAlfrescoListVisitor.java rename to src/main/java/org/openmbee/mdk/viewedit/DBAlfrescoListVisitor.java index 931ef6f94..ecfd62d2c 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/viewedit/DBAlfrescoListVisitor.java +++ b/src/main/java/org/openmbee/mdk/viewedit/DBAlfrescoListVisitor.java @@ -1,10 +1,10 @@ -package gov.nasa.jpl.mbee.mdk.viewedit; +package org.openmbee.mdk.viewedit; import com.nomagic.magicdraw.core.Project; -import gov.nasa.jpl.mbee.mdk.api.incubating.convert.Converters; -import gov.nasa.jpl.mbee.mdk.docgen.docbook.*; +import org.openmbee.mdk.api.incubating.convert.Converters; import org.json.simple.JSONArray; import org.json.simple.JSONObject; +import org.openmbee.mdk.docgen.docbook.*; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/viewedit/DBAlfrescoTableVisitor.java b/src/main/java/org/openmbee/mdk/viewedit/DBAlfrescoTableVisitor.java similarity index 98% rename from src/main/java/gov/nasa/jpl/mbee/mdk/viewedit/DBAlfrescoTableVisitor.java rename to src/main/java/org/openmbee/mdk/viewedit/DBAlfrescoTableVisitor.java index 003d87ef2..307505b74 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/viewedit/DBAlfrescoTableVisitor.java +++ b/src/main/java/org/openmbee/mdk/viewedit/DBAlfrescoTableVisitor.java @@ -1,10 +1,10 @@ -package gov.nasa.jpl.mbee.mdk.viewedit; +package org.openmbee.mdk.viewedit; import com.nomagic.magicdraw.core.Project; -import gov.nasa.jpl.mbee.mdk.api.incubating.convert.Converters; -import gov.nasa.jpl.mbee.mdk.docgen.docbook.*; +import org.openmbee.mdk.api.incubating.convert.Converters; import org.json.simple.JSONArray; import org.json.simple.JSONObject; +import org.openmbee.mdk.docgen.docbook.*; import java.util.HashSet; import java.util.List; diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/viewedit/DBAlfrescoVisitor.java b/src/main/java/org/openmbee/mdk/viewedit/DBAlfrescoVisitor.java similarity index 97% rename from src/main/java/gov/nasa/jpl/mbee/mdk/viewedit/DBAlfrescoVisitor.java rename to src/main/java/org/openmbee/mdk/viewedit/DBAlfrescoVisitor.java index bf448d45d..c3d7f4977 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/viewedit/DBAlfrescoVisitor.java +++ b/src/main/java/org/openmbee/mdk/viewedit/DBAlfrescoVisitor.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.viewedit; +package org.openmbee.mdk.viewedit; import com.nomagic.magicdraw.core.Application; import com.nomagic.magicdraw.core.GUILog; @@ -6,17 +6,17 @@ import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.ElementValue; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.InstanceSpecification; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Slot; -import gov.nasa.jpl.mbee.mdk.api.docgen.uml.classes.PresentationElementClasses; -import gov.nasa.jpl.mbee.mdk.api.incubating.MDKConstants; -import gov.nasa.jpl.mbee.mdk.api.incubating.convert.Converters; -import gov.nasa.jpl.mbee.mdk.docgen.DocGenUtils; -import gov.nasa.jpl.mbee.mdk.docgen.docbook.*; -import gov.nasa.jpl.mbee.mdk.generator.PresentationElementInfo; -import gov.nasa.jpl.mbee.mdk.generator.PresentationElementInstance; -import gov.nasa.jpl.mbee.mdk.generator.PresentationElementUtils; -import gov.nasa.jpl.mbee.mdk.model.Section; +import org.openmbee.mdk.api.docgen.uml.classes.PresentationElementClasses; +import org.openmbee.mdk.api.incubating.MDKConstants; +import org.openmbee.mdk.api.incubating.convert.Converters; +import org.openmbee.mdk.docgen.DocGenUtils; +import org.openmbee.mdk.generator.PresentationElementInfo; +import org.openmbee.mdk.generator.PresentationElementInstance; +import org.openmbee.mdk.generator.PresentationElementUtils; +import org.openmbee.mdk.model.Section; import org.json.simple.JSONArray; import org.json.simple.JSONObject; +import org.openmbee.mdk.docgen.docbook.*; import java.util.*; @@ -51,7 +51,7 @@ public class DBAlfrescoVisitor extends DBAbstractVisitor { private Stack> currentUnusedInstances = new Stack<>(); private Stack> newpe = new Stack<>(); - private boolean main = false; //for ems 2.2 reference tree, only consider generated pe from main view and + private boolean main = false; //for ems 2.2 reference tree, only consider generated pe from main view and //not nested tables/lists since those are embedded in json blob, main is false for Table and List Visitor private PresentationElementUtils viu = new PresentationElementUtils(); diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/viewedit/DBHTMLVisitor.java b/src/main/java/org/openmbee/mdk/viewedit/DBHTMLVisitor.java similarity index 93% rename from src/main/java/gov/nasa/jpl/mbee/mdk/viewedit/DBHTMLVisitor.java rename to src/main/java/org/openmbee/mdk/viewedit/DBHTMLVisitor.java index e56b6e383..712ded5d3 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/viewedit/DBHTMLVisitor.java +++ b/src/main/java/org/openmbee/mdk/viewedit/DBHTMLVisitor.java @@ -1,7 +1,7 @@ -package gov.nasa.jpl.mbee.mdk.viewedit; +package org.openmbee.mdk.viewedit; -import gov.nasa.jpl.mbee.mdk.docgen.DocGenUtils; -import gov.nasa.jpl.mbee.mdk.docgen.docbook.*; +import org.openmbee.mdk.docgen.DocGenUtils; +import org.openmbee.mdk.docgen.docbook.*; public class DBHTMLVisitor extends DBAbstractVisitor { diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/viewedit/ViewHierarchyVisitor.java b/src/main/java/org/openmbee/mdk/viewedit/ViewHierarchyVisitor.java similarity index 79% rename from src/main/java/gov/nasa/jpl/mbee/mdk/viewedit/ViewHierarchyVisitor.java rename to src/main/java/org/openmbee/mdk/viewedit/ViewHierarchyVisitor.java index 5a0776d0e..e7c4fbd70 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/viewedit/ViewHierarchyVisitor.java +++ b/src/main/java/org/openmbee/mdk/viewedit/ViewHierarchyVisitor.java @@ -1,12 +1,9 @@ -package gov.nasa.jpl.mbee.mdk.viewedit; +package org.openmbee.mdk.viewedit; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; -import gov.nasa.jpl.mbee.mdk.api.incubating.convert.Converters; -import gov.nasa.jpl.mbee.mdk.model.AbstractModelVisitor; -import gov.nasa.jpl.mbee.mdk.model.Document; -import gov.nasa.jpl.mbee.mdk.model.Section; -import org.json.simple.JSONArray; -import org.json.simple.JSONObject; +import org.openmbee.mdk.model.AbstractModelVisitor; +import org.openmbee.mdk.model.Document; +import org.openmbee.mdk.model.Section; import java.util.*; diff --git a/src/main/resources/gov/nasa/jpl/mbee/mdk/json/diff/ui/DiffView.css b/src/main/resources/org/openmbee/mdk/json/diff/ui/DiffView.css similarity index 100% rename from src/main/resources/gov/nasa/jpl/mbee/mdk/json/diff/ui/DiffView.css rename to src/main/resources/org/openmbee/mdk/json/diff/ui/DiffView.css diff --git a/src/main/resources/gov/nasa/jpl/mbee/mdk/json/diff/ui/DiffView.fxml b/src/main/resources/org/openmbee/mdk/json/diff/ui/DiffView.fxml similarity index 100% rename from src/main/resources/gov/nasa/jpl/mbee/mdk/json/diff/ui/DiffView.fxml rename to src/main/resources/org/openmbee/mdk/json/diff/ui/DiffView.fxml diff --git a/src/main/resources/gov/nasa/jpl/mbee/mdk/options/EnvironmentOptionsResources.properties b/src/main/resources/org/openmbee/mdk/options/EnvironmentOptionsResources.properties similarity index 83% rename from src/main/resources/gov/nasa/jpl/mbee/mdk/options/EnvironmentOptionsResources.properties rename to src/main/resources/org/openmbee/mdk/options/EnvironmentOptionsResources.properties index 861992ca9..1d695351b 100644 --- a/src/main/resources/gov/nasa/jpl/mbee/mdk/options/EnvironmentOptionsResources.properties +++ b/src/main/resources/org/openmbee/mdk/options/EnvironmentOptionsResources.properties @@ -10,9 +10,9 @@ CUSTOM_USER_SCRIPT_DIRECTORIES_ID=Custom User Scripts Directories CUSTOM_USER_SCRIPT_DIRECTORIES_ID_DESCRIPTION=Specifies additional directories that custom user scripts can be found in. Multiple directories can be specified, but they must be separated by ";" on Windows systems or ":" on Mac and Linux systems. SHOW_ADVANCED_OPTIONS_ID=Show Advanced Options SHOW_ADVANCED_OPTIONS_ID_DESCRIPTION=Enables advanced features in the MMS menu, such as branch validation. You must restart MagicDraw after enabling this field to see the options in the menu. +MMS_AUTHENTICATION_CHAIN=org.openmbee.mdk.tickets.TWCAcquireTicketProcessor,org.openmbee.mdk.tickets.BasicAuthAcquireTicketProcessor,org.openmbee.mdk.tickets.AuthenticationChainError +MMS_AUTHENTICATION_CHAIN_DESCRIPTION=Authentication chain used for getting ticket from MMS4 as defined in above order separated by comma. Error class must be the last. DOCBOOK_TO_PDF_STYLESHEET=DocBook to PDF Stylesheet DOCBOOK_TO_PDF_STYLESHEET_DESCRIPTION=Stores the last DocBook to PDF Stylesheet used while converting DocBook to PDF. MDK_OPTIONS_NAME=MDK GROUP=MDK -MMS_AUTHENTICATION_CHAIN=gov.nasa.jpl.mbee.mdk.tickets.TWCAcquireTicketProcessor,gov.nasa.jpl.mbee.mdk.tickets.BasicAuthAcquireTicketProcessor,gov.nasa.jpl.mbee.mdk.tickets.AuthenticationChainError -#Authentication chain used for getting ticket from MMS4 as defined in above order separated by comma. Error class must be the last. \ No newline at end of file diff --git a/src/main/resources/gov/nasa/jpl/mbee/mdk/options/ProjectOptionsResources.properties b/src/main/resources/org/openmbee/mdk/options/ProjectOptionsResources.properties similarity index 100% rename from src/main/resources/gov/nasa/jpl/mbee/mdk/options/ProjectOptionsResources.properties rename to src/main/resources/org/openmbee/mdk/options/ProjectOptionsResources.properties diff --git a/src/test/java/gov/nasa/jpl/mbee/mdk/MDKPluginTest.java b/src/test/java/org/openmbee/mdk/MDKPluginTest.java similarity index 86% rename from src/test/java/gov/nasa/jpl/mbee/mdk/MDKPluginTest.java rename to src/test/java/org/openmbee/mdk/MDKPluginTest.java index 9c1242132..1223e9425 100644 --- a/src/test/java/gov/nasa/jpl/mbee/mdk/MDKPluginTest.java +++ b/src/test/java/org/openmbee/mdk/MDKPluginTest.java @@ -1,7 +1,7 @@ -package gov.nasa.jpl.mbee.mdk; +package org.openmbee.mdk; import com.nomagic.magicdraw.plugins.PluginUtils; -import gov.nasa.jpl.mbee.mdk.test.framework.ApplicationStartClassRunner; +import org.openmbee.mdk.test.framework.ApplicationStartClassRunner; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -22,4 +22,4 @@ public static void setup() { public void init() { assertTrue("MDK shall be installed in MagicDraw.", plugin != null && plugin.getDescriptor().getName().equals("Model Development Kit")); } -} \ No newline at end of file +} diff --git a/src/test/java/gov/nasa/jpl/mbee/mdk/MMSConfiguratorTest.java b/src/test/java/org/openmbee/mdk/MMSConfiguratorTest.java similarity index 80% rename from src/test/java/gov/nasa/jpl/mbee/mdk/MMSConfiguratorTest.java rename to src/test/java/org/openmbee/mdk/MMSConfiguratorTest.java index a06c314a6..6522d63a1 100644 --- a/src/test/java/gov/nasa/jpl/mbee/mdk/MMSConfiguratorTest.java +++ b/src/test/java/org/openmbee/mdk/MMSConfiguratorTest.java @@ -1,10 +1,8 @@ -package gov.nasa.jpl.mbee.mdk; +package org.openmbee.mdk; import com.nomagic.actions.NMAction; import com.nomagic.actions.ActionsManager; -import gov.nasa.jpl.mbee.mdk.test.framework.ApplicationStartClassRunner; import org.junit.Test; -import org.junit.runner.RunWith; import static org.junit.Assert.assertTrue; @@ -19,4 +17,4 @@ public void configure() { assertTrue("MMSSyncPlugin shall return a single instance.", category != null); } -} \ No newline at end of file +} diff --git a/src/test/java/gov/nasa/jpl/mbee/mdk/MMSSyncPluginTest.java b/src/test/java/org/openmbee/mdk/MMSSyncPluginTest.java similarity index 95% rename from src/test/java/gov/nasa/jpl/mbee/mdk/MMSSyncPluginTest.java rename to src/test/java/org/openmbee/mdk/MMSSyncPluginTest.java index ff26b2477..4e176965b 100644 --- a/src/test/java/gov/nasa/jpl/mbee/mdk/MMSSyncPluginTest.java +++ b/src/test/java/org/openmbee/mdk/MMSSyncPluginTest.java @@ -1,6 +1,6 @@ -package gov.nasa.jpl.mbee.mdk; +package org.openmbee.mdk; -import gov.nasa.jpl.mbee.mdk.test.framework.ApplicationStartClassRunner; +import org.openmbee.mdk.test.framework.ApplicationStartClassRunner; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -52,4 +52,4 @@ public void getSyncStatusProjectEventListenerAdapter() { assertTrue("MMSSyncPlugin shall return a SyncStatusProjectEventListenerAdapter.", plugin != null && MMSSyncPlugin.getInstance().getSyncStatusProjectEventListenerAdapter() != null); } -} \ No newline at end of file +} diff --git a/src/test/java/gov/nasa/jpl/mbee/mdk/mms/actions/GeneratePdfActionFromModelTest.java b/src/test/java/org/openmbee/mdk/mms/actions/GeneratePdfActionFromModelTest.java similarity index 92% rename from src/test/java/gov/nasa/jpl/mbee/mdk/mms/actions/GeneratePdfActionFromModelTest.java rename to src/test/java/org/openmbee/mdk/mms/actions/GeneratePdfActionFromModelTest.java index ad4408c6f..141540665 100644 --- a/src/test/java/gov/nasa/jpl/mbee/mdk/mms/actions/GeneratePdfActionFromModelTest.java +++ b/src/test/java/org/openmbee/mdk/mms/actions/GeneratePdfActionFromModelTest.java @@ -1,12 +1,12 @@ -package gov.nasa.jpl.mbee.mdk.mms.actions; +package org.openmbee.mdk.mms.actions; import com.nomagic.magicdraw.core.Application; import com.nomagic.magicdraw.core.Project; import com.nomagic.magicdraw.tests.MagicDrawTestRunner; import com.nomagic.magicdraw.uml.BaseElement; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element; -import gov.nasa.jpl.mbee.mdk.api.MagicDrawHelper; -import gov.nasa.jpl.mbee.mdk.options.MDKEnvironmentOptionsGroup; +import org.openmbee.mdk.api.MagicDrawHelper; +import org.openmbee.mdk.options.MDKEnvironmentOptionsGroup; import org.apache.commons.io.FileUtils; import org.junit.AfterClass; import org.junit.Assert; @@ -57,7 +57,7 @@ public static void setupProject() throws Exception { project = Application.getInstance().getProject(); //ClassLoader classLoader = GeneratePDFFromMDModelTest.class.getClassLoader(); - docbookXslFo = new File(userdir + File.separator + "plugins" + File.separator + "gov.nasa.jpl.cae.magicdraw.mdk" + File.separator + "docbook-xsl" + File.separator + "fo" + File.separator + "mdk-default.xsl"); + docbookXslFo = new File(userdir + File.separator + "plugins" + File.separator + "org.openmbee.mdk" + File.separator + "docbook-xsl" + File.separator + "fo" + File.separator + "mdk-default.xsl"); if (!docbookXslFo.exists()) { throw new Exception("\"docbook.xsl\" is not found in mdk plugin."); } @@ -105,4 +105,4 @@ public void testMdkModelToPdfDocGenUsersGuide() { } -} \ No newline at end of file +} diff --git a/src/test/java/gov/nasa/jpl/mbee/mdk/test/framework/ApplicationStartClassRunner.java b/src/test/java/org/openmbee/mdk/test/framework/ApplicationStartClassRunner.java similarity index 95% rename from src/test/java/gov/nasa/jpl/mbee/mdk/test/framework/ApplicationStartClassRunner.java rename to src/test/java/org/openmbee/mdk/test/framework/ApplicationStartClassRunner.java index 738623ccc..4972344ce 100644 --- a/src/test/java/gov/nasa/jpl/mbee/mdk/test/framework/ApplicationStartClassRunner.java +++ b/src/test/java/org/openmbee/mdk/test/framework/ApplicationStartClassRunner.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.test.framework; +package org.openmbee.mdk.test.framework; import com.nomagic.magicdraw.core.Application; import com.nomagic.magicdraw.tests.MagicDrawTestRunner; @@ -32,4 +32,4 @@ public ApplicationStartClassRunner(Class clazz) throws InitializationError { System.exit(1); } } -} \ No newline at end of file +} diff --git a/src/test/java/gov/nasa/jpl/mbee/mdk/test/framework/GradleMagicDrawLauncher.java b/src/test/java/org/openmbee/mdk/test/framework/GradleMagicDrawLauncher.java similarity index 97% rename from src/test/java/gov/nasa/jpl/mbee/mdk/test/framework/GradleMagicDrawLauncher.java rename to src/test/java/org/openmbee/mdk/test/framework/GradleMagicDrawLauncher.java index 4062579a4..b6de7ccc1 100644 --- a/src/test/java/gov/nasa/jpl/mbee/mdk/test/framework/GradleMagicDrawLauncher.java +++ b/src/test/java/org/openmbee/mdk/test/framework/GradleMagicDrawLauncher.java @@ -1,4 +1,4 @@ -package gov.nasa.jpl.mbee.mdk.test.framework; +package org.openmbee.mdk.test.framework; import com.nomagic.runtime.ApplicationExitedException; import org.gradle.process.internal.streams.EncodedStream; @@ -6,9 +6,6 @@ import java.io.DataInputStream; import java.io.File; import java.io.IOException; -import java.io.ObjectInputStream; -import java.lang.management.ManagementFactory; -import java.lang.management.RuntimeMXBean; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.net.*; @@ -148,4 +145,4 @@ private void parseArgs(String... args) throws IOException { private static boolean isAcceptablePath(String path) { return !path.contains("com.typesafe.akka") && !path.contains("org.scala") && !path.contains("com.nomagic.esi"); } -} \ No newline at end of file +} diff --git a/src/test/java/gov/nasa/jpl/mbee/mdk/test/framework/MagicDrawClassLoaderWorker.java b/src/test/java/org/openmbee/mdk/test/framework/MagicDrawClassLoaderWorker.java similarity index 97% rename from src/test/java/gov/nasa/jpl/mbee/mdk/test/framework/MagicDrawClassLoaderWorker.java rename to src/test/java/org/openmbee/mdk/test/framework/MagicDrawClassLoaderWorker.java index 6554c11b7..8657411e0 100644 --- a/src/test/java/gov/nasa/jpl/mbee/mdk/test/framework/MagicDrawClassLoaderWorker.java +++ b/src/test/java/org/openmbee/mdk/test/framework/MagicDrawClassLoaderWorker.java @@ -14,9 +14,8 @@ * limitations under the License. */ -package gov.nasa.jpl.mbee.mdk.test.framework; +package org.openmbee.mdk.test.framework; -import com.nomagic.esi.emf.a.D; import org.gradle.api.Action; import org.gradle.api.logging.LogLevel; import org.gradle.internal.UncheckedException; @@ -27,10 +26,8 @@ import org.gradle.internal.io.ClassLoaderObjectInputStream; import org.gradle.internal.logging.LoggingManagerInternal; import org.gradle.internal.logging.services.LoggingServiceRegistry; -import org.gradle.internal.remote.MessagingClient; import org.gradle.internal.remote.ObjectConnection; import org.gradle.internal.remote.internal.ConnectCompletion; -import org.gradle.internal.remote.internal.hub.MessageHubBackedClient; import org.gradle.internal.remote.internal.hub.MessageHubBackedObjectConnection; import org.gradle.internal.remote.internal.inet.MultiChoiceAddress; import org.gradle.internal.remote.internal.inet.MultiChoiceAddressSerializer; diff --git a/src/test/java/gov/nasa/jpl/mbee/mdk/util/UtilsTest.java b/src/test/java/org/openmbee/mdk/util/UtilsTest.java similarity index 77% rename from src/test/java/gov/nasa/jpl/mbee/mdk/util/UtilsTest.java rename to src/test/java/org/openmbee/mdk/util/UtilsTest.java index e9320b69f..c960de81f 100644 --- a/src/test/java/gov/nasa/jpl/mbee/mdk/util/UtilsTest.java +++ b/src/test/java/org/openmbee/mdk/util/UtilsTest.java @@ -1,16 +1,13 @@ -package gov.nasa.jpl.mbee.mdk.util; +package org.openmbee.mdk.util; import com.nomagic.magicdraw.core.Application; import com.nomagic.magicdraw.core.Project; import com.nomagic.magicdraw.tests.MagicDrawTestRunner; -import com.nomagic.magicdraw.uml.BaseElement; -import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Property; -import com.nomagic.uml2.ext.magicdraw.mdprofiles.Stereotype; -import gov.nasa.jpl.mbee.mdk.api.MagicDrawHelper; -import gov.nasa.jpl.mbee.mdk.http.ServerException; -import gov.nasa.jpl.mbee.mdk.options.MDKEnvironmentOptionsGroup; +import org.openmbee.mdk.api.MagicDrawHelper; +import org.openmbee.mdk.http.ServerException; +import org.openmbee.mdk.options.MDKEnvironmentOptionsGroup; import org.apache.commons.io.IOUtils; @@ -19,10 +16,8 @@ import java.io.IOException; import java.net.URISyntaxException; -import org.junit.Assert; import org.junit.AfterClass; import org.junit.BeforeClass; -import org.junit.Test; import org.junit.runner.RunWith; /** diff --git a/src/test/java/worker/org/gradle/process/internal/worker/GradleWorkerMain.java b/src/test/java/worker/org/gradle/process/internal/worker/GradleWorkerMain.java index 47e74217f..f2570d039 100644 --- a/src/test/java/worker/org/gradle/process/internal/worker/GradleWorkerMain.java +++ b/src/test/java/worker/org/gradle/process/internal/worker/GradleWorkerMain.java @@ -18,15 +18,9 @@ //import org.gradle.internal.classloader.FilteringClassLoader; import org.gradle.process.internal.streams.EncodedStream; +import org.openmbee.mdk.test.framework.GradleMagicDrawLauncher; import java.io.DataInputStream; -import java.io.File; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.net.URL; -import java.net.URLClassLoader; -import java.util.ArrayList; -import java.util.List; import java.util.concurrent.Callable; /** @@ -35,7 +29,7 @@ */ /** - * Disables the Gradle dynamic classloading as its already done in {@link gov.nasa.jpl.mbee.mdk.test.framework.GradleMagicDrawLauncher}. + * Disables the Gradle dynamic classloading as its already done in {@link GradleMagicDrawLauncher}. * Additionally uses reflection to change the system class loader to the current OSGi one, since Gradle library uses it to load the JUnit test and potentially other necessary components that will not be available in the bootstrap class loader. * * @author igomes @@ -99,7 +93,7 @@ public void run() throws Exception { //Class workerClass = ClassLoader.loadClass("org.gradle.process.internal.worker.child.SystemApplicationClassLoaderWorker").asSubclass(Callable.class); //Class workerClass = Class.forName("org.gradle.process.internal.worker.child.SystemApplicationClassLoaderWorker", false, getClass().getClassLoader()).asSubclass(Callable.class); - Class workerClass = Class.forName("gov.nasa.jpl.mbee.mdk.test.framework.MagicDrawClassLoaderWorker", false, getClass().getClassLoader()).asSubclass(Callable.class); + Class workerClass = Class.forName("org.openmbee.mdk.test.framework.MagicDrawClassLoaderWorker", false, getClass().getClassLoader()).asSubclass(Callable.class); Callable main = workerClass.getConstructor(DataInputStream.class).newInstance(instr); main.call(); }