diff --git a/sqldev/sqldeveloper.xml b/sqldev/sqldeveloper.xml index 31b5c88d..ff6f5d3d 100644 --- a/sqldev/sqldeveloper.xml +++ b/sqldev/sqldeveloper.xml @@ -1,16 +1,18 @@ - - #EXTENSION_NAME# - #EXTENSION_VERSION# - #EXTENSION_OWNER# - http://utplsql.org/ + xmlns="http://xmlns.oracle.com/jdeveloper/updatecenter" + xmlns:u="http://xmlns.oracle.com/jdeveloper/update"> + + #EXTENSION_NAME# + #EXTENSION_VERSION# + #EXTENSION_OWNER# + http://utplsql.org/ - + - https://github.com/utPLSQL/utPLSQL-SQLDeveloper/releases/download/v#EXTENSION_SHORT_VERSION#/#EXTENSION_DEPLOYABLE# - + https://github.com/utPLSQL/utPLSQL-SQLDeveloper/releases/download/v#EXTENSION_SHORT_VERSION#/#EXTENSION_DEPLOYABLE# + + diff --git a/sqldev/src/main/java/org/utplsql/sqldev/menu/UtplsqlController.xtend b/sqldev/src/main/java/org/utplsql/sqldev/menu/UtplsqlController.xtend index b5d683e2..f8fc1f96 100644 --- a/sqldev/src/main/java/org/utplsql/sqldev/menu/UtplsqlController.xtend +++ b/sqldev/src/main/java/org/utplsql/sqldev/menu/UtplsqlController.xtend @@ -36,9 +36,9 @@ import oracle.ide.editor.Editor import org.utplsql.sqldev.UtplsqlWorksheet import org.utplsql.sqldev.dal.UtplsqlDao import org.utplsql.sqldev.model.URLTools +import org.utplsql.sqldev.model.oddgen.GenContext import org.utplsql.sqldev.model.preference.PreferenceModel import org.utplsql.sqldev.oddgen.TestTemplate -import org.utplsql.sqldev.oddgen.model.GenContext import org.utplsql.sqldev.parser.UtplsqlParser class UtplsqlController implements Controller { @@ -196,16 +196,16 @@ class UtplsqlController implements Controller { private def void populateGenContext(GenContext genContext, PreferenceModel preferences) { genContext.generateFiles = preferences.generateFiles - genContext.outputDirectory = preferences.outputDirectory + genContext.outputDirectory = preferences.outputDirectory genContext.testPackagePrefix = preferences.testPackagePrefix.toLowerCase genContext.testPackageSuffix = preferences.testPackageSuffix.toLowerCase genContext.testUnitPrefix = preferences.testUnitPrefix.toLowerCase genContext.testUnitSuffix = preferences.testUnitSuffix.toLowerCase - genContext.numberOfTestsPerUnit = preferences.numberOfTestsPerUnit - genContext.generateComments = preferences.generateComments - genContext.disableTests = preferences.disableTests - genContext.suitePath = preferences.suitePath.toLowerCase - genContext.indentSpaces = preferences.indentSpaces + genContext.numberOfTestsPerUnit = preferences.numberOfTestsPerUnit + genContext.generateComments = preferences.generateComments + genContext.disableTests = preferences.disableTests + genContext.suitePath = preferences.suitePath.toLowerCase + genContext.indentSpaces = preferences.indentSpaces } private def getGenContext(Context context) { diff --git a/sqldev/src/main/java/org/utplsql/sqldev/oddgen/model/GenContext.xtend b/sqldev/src/main/java/org/utplsql/sqldev/model/oddgen/GenContext.xtend similarity index 96% rename from sqldev/src/main/java/org/utplsql/sqldev/oddgen/model/GenContext.xtend rename to sqldev/src/main/java/org/utplsql/sqldev/model/oddgen/GenContext.xtend index d3897f6a..a9767dad 100644 --- a/sqldev/src/main/java/org/utplsql/sqldev/oddgen/model/GenContext.xtend +++ b/sqldev/src/main/java/org/utplsql/sqldev/model/oddgen/GenContext.xtend @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.utplsql.sqldev.oddgen.model +package org.utplsql.sqldev.model.oddgen import java.sql.Connection import org.eclipse.xtend.lib.annotations.Accessors diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/preference/PreferenceModel.xtend b/sqldev/src/main/java/org/utplsql/sqldev/model/preference/PreferenceModel.xtend index db7d71f4..e37eba65 100644 --- a/sqldev/src/main/java/org/utplsql/sqldev/model/preference/PreferenceModel.xtend +++ b/sqldev/src/main/java/org/utplsql/sqldev/model/preference/PreferenceModel.xtend @@ -45,7 +45,7 @@ class PreferenceModel extends HashStructureAdapter { static final String KEY_NUMBER_OF_TESTS_PER_UNIT = "numberOfTestsPerUnit" static final String KEY_CHECK_GENERATE_UTPLSQL_TEST = "checkGenerateUtplsqlTest" static final String KEY_GENERATE_COMMENTS = "generateComments" - static final String KEY_DISABLE_TESTS = "disableTests" + static final String KEY_DISABLE_TESTS = "disableTests" static final String KEY_SUITE_PATH="suitePath" static final String KEY_INDENT_SPACES="indentSpaces" static final String KEY_GENERATE_FILES="generateFiles" diff --git a/sqldev/src/main/java/org/utplsql/sqldev/oddgen/TestGenerator.xtend b/sqldev/src/main/java/org/utplsql/sqldev/oddgen/TestGenerator.xtend index 83d389f6..41b18ce5 100644 --- a/sqldev/src/main/java/org/utplsql/sqldev/oddgen/TestGenerator.xtend +++ b/sqldev/src/main/java/org/utplsql/sqldev/oddgen/TestGenerator.xtend @@ -27,9 +27,9 @@ import org.oddgen.sqldev.generators.model.Node import org.oddgen.sqldev.generators.model.NodeTools import org.oddgen.sqldev.plugin.templates.TemplateTools import org.utplsql.sqldev.dal.UtplsqlDao +import org.utplsql.sqldev.model.oddgen.GenContext import org.utplsql.sqldev.model.preference.PreferenceModel import org.utplsql.sqldev.resources.UtplsqlResources -import org.utplsql.sqldev.oddgen.model.GenContext class TestGenerator implements OddgenGenerator2 { @@ -56,17 +56,17 @@ class TestGenerator implements OddgenGenerator2 { val context = new GenContext() context.objectType = node.toObjectType context.objectName = node.toObjectName - context.generateFiles = node.params.get(GENERATE_FILES) == YES - context.outputDirectory = node.params.get(OUTPUT_DIRECTORY) + context.generateFiles = node.params.get(GENERATE_FILES) == YES + context.outputDirectory = node.params.get(OUTPUT_DIRECTORY) context.testPackagePrefix = node.params.get(TEST_PACKAGE_PREFIX).toLowerCase context.testPackageSuffix = node.params.get(TEST_PACKAGE_SUFFIX).toLowerCase context.testUnitPrefix = node.params.get(TEST_UNIT_PREFIX).toLowerCase context.testUnitSuffix = node.params.get(TEST_UNIT_SUFFIX).toLowerCase - context.numberOfTestsPerUnit = Integer.valueOf(node.params.get(NUMBER_OF_TESTS_PER_UNIT)) - context.generateComments = node.params.get(GENERATE_COMMENTS) == YES - context.disableTests = node.params.get(DISABLE_TESTS) == YES - context.suitePath = node.params.get(SUITE_PATH).toLowerCase - context.indentSpaces = Integer.valueOf(node.params.get(INDENT_SPACES)) + context.numberOfTestsPerUnit = Integer.valueOf(node.params.get(NUMBER_OF_TESTS_PER_UNIT)) + context.generateComments = node.params.get(GENERATE_COMMENTS) == YES + context.disableTests = node.params.get(DISABLE_TESTS) == YES + context.suitePath = node.params.get(SUITE_PATH).toLowerCase + context.indentSpaces = Integer.valueOf(node.params.get(INDENT_SPACES)) return context } @@ -101,7 +101,7 @@ class TestGenerator implements OddgenGenerator2 { «ENDIF» «ENDIF» «ENDFOR» - ''' + ''' override isSupported(Connection conn) { var ret = false diff --git a/sqldev/src/main/java/org/utplsql/sqldev/oddgen/TestTemplate.xtend b/sqldev/src/main/java/org/utplsql/sqldev/oddgen/TestTemplate.xtend index 11d43564..106dbc4b 100644 --- a/sqldev/src/main/java/org/utplsql/sqldev/oddgen/TestTemplate.xtend +++ b/sqldev/src/main/java/org/utplsql/sqldev/oddgen/TestTemplate.xtend @@ -19,7 +19,7 @@ import java.time.LocalDateTime import java.time.format.DateTimeFormatter import java.util.List import org.utplsql.sqldev.dal.UtplsqlDao -import org.utplsql.sqldev.oddgen.model.GenContext +import org.utplsql.sqldev.model.oddgen.GenContext class TestTemplate { var GenContext context diff --git a/sqldev/src/main/resources/org/utplsql/sqldev/resources/accelerators.xml b/sqldev/src/main/resources/org/utplsql/sqldev/resources/accelerators.xml index 6ed2ac3e..72bac9cf 100644 --- a/sqldev/src/main/resources/org/utplsql/sqldev/resources/accelerators.xml +++ b/sqldev/src/main/resources/org/utplsql/sqldev/resources/accelerators.xml @@ -1,18 +1,18 @@ - - - alt shift T - - - alt shift G - - - - - alt shift T - - - alt shift G - - + + + alt shift T + + + alt shift G + + + + + alt shift T + + + alt shift G + +