Skip to content

Commit e41aabc

Browse files
PhilippSalvisbergPhilippSalvisberg
authored
Merge pull request #28 from PhilippSalvisberg/develop
Formatting and rename package for GenContext
2 parents 577cf23 + 6e82081 commit e41aabc

File tree

7 files changed

+47
-45
lines changed

7 files changed

+47
-45
lines changed

‎sqldev/sqldeveloper.xml

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
22
<updates version="2.0"
3-
xmlns="http://xmlns.oracle.com/jdeveloper/updatecenter"
4-
xmlns:u="http://xmlns.oracle.com/jdeveloper/update">
5-
<u:update id="org.utplsql.sqldev">
6-
<u:name>#EXTENSION_NAME#</u:name>
7-
<u:version>#EXTENSION_VERSION#</u:version>
8-
<u:author>#EXTENSION_OWNER#</u:author>
9-
<u:author-url>http://utplsql.org/</u:author-url>
3+
xmlns="http://xmlns.oracle.com/jdeveloper/updatecenter"
4+
xmlns:u="http://xmlns.oracle.com/jdeveloper/update">
5+
<u:update id="org.utplsql.sqldev">
6+
<u:name>#EXTENSION_NAME#</u:name>
7+
<u:version>#EXTENSION_VERSION#</u:version>
8+
<u:author>#EXTENSION_OWNER#</u:author>
9+
<u:author-url>http://utplsql.org/</u:author-url>
1010
<u:description><![CDATA[#EXTENSION_DESCRIPTION#]]></u:description>
1111
<u:requirements>
12-
<u:requires-extension id="oracle.sqldeveloper" minVersion="#MIN_SQLDEV_VERSION#"/>
12+
<u:requires-extension id="oracle.sqldeveloper"
13+
minVersion="#MIN_SQLDEV_VERSION#" />
1314
</u:requirements>
14-
<u:bundle-url>https://github.com/utPLSQL/utPLSQL-SQLDeveloper/releases/download/v#EXTENSION_SHORT_VERSION#/#EXTENSION_DEPLOYABLE#</u:bundle-url>
15-
</u:update>
15+
<u:bundle-url>https://github.com/utPLSQL/utPLSQL-SQLDeveloper/releases/download/v#EXTENSION_SHORT_VERSION#/#EXTENSION_DEPLOYABLE#
16+
</u:bundle-url>
17+
</u:update>
1618
</updates>

‎sqldev/src/main/java/org/utplsql/sqldev/menu/UtplsqlController.xtend

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ import oracle.ide.editor.Editor
3636
import org.utplsql.sqldev.UtplsqlWorksheet
3737
import org.utplsql.sqldev.dal.UtplsqlDao
3838
import org.utplsql.sqldev.model.URLTools
39+
import org.utplsql.sqldev.model.oddgen.GenContext
3940
import org.utplsql.sqldev.model.preference.PreferenceModel
4041
import org.utplsql.sqldev.oddgen.TestTemplate
41-
import org.utplsql.sqldev.oddgen.model.GenContext
4242
import org.utplsql.sqldev.parser.UtplsqlParser
4343

4444
class UtplsqlController implements Controller {
@@ -196,16 +196,16 @@ class UtplsqlController implements Controller {
196196

197197
private def void populateGenContext(GenContext genContext, PreferenceModel preferences) {
198198
genContext.generateFiles = preferences.generateFiles
199-
genContext.outputDirectory = preferences.outputDirectory
199+
genContext.outputDirectory = preferences.outputDirectory
200200
genContext.testPackagePrefix = preferences.testPackagePrefix.toLowerCase
201201
genContext.testPackageSuffix = preferences.testPackageSuffix.toLowerCase
202202
genContext.testUnitPrefix = preferences.testUnitPrefix.toLowerCase
203203
genContext.testUnitSuffix = preferences.testUnitSuffix.toLowerCase
204-
genContext.numberOfTestsPerUnit = preferences.numberOfTestsPerUnit
205-
genContext.generateComments = preferences.generateComments
206-
genContext.disableTests = preferences.disableTests
207-
genContext.suitePath = preferences.suitePath.toLowerCase
208-
genContext.indentSpaces = preferences.indentSpaces
204+
genContext.numberOfTestsPerUnit = preferences.numberOfTestsPerUnit
205+
genContext.generateComments = preferences.generateComments
206+
genContext.disableTests = preferences.disableTests
207+
genContext.suitePath = preferences.suitePath.toLowerCase
208+
genContext.indentSpaces = preferences.indentSpaces
209209
}
210210

211211
private def getGenContext(Context context) {

‎sqldev/src/main/java/org/utplsql/sqldev/oddgen/model/GenContext.xtend renamed to ‎sqldev/src/main/java/org/utplsql/sqldev/model/oddgen/GenContext.xtend

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.utplsql.sqldev.oddgen.model
16+
package org.utplsql.sqldev.model.oddgen
1717

1818
import java.sql.Connection
1919
import org.eclipse.xtend.lib.annotations.Accessors

‎sqldev/src/main/java/org/utplsql/sqldev/model/preference/PreferenceModel.xtend

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class PreferenceModel extends HashStructureAdapter {
4545
static final String KEY_NUMBER_OF_TESTS_PER_UNIT = "numberOfTestsPerUnit"
4646
static final String KEY_CHECK_GENERATE_UTPLSQL_TEST = "checkGenerateUtplsqlTest"
4747
static final String KEY_GENERATE_COMMENTS = "generateComments"
48-
static final String KEY_DISABLE_TESTS = "disableTests"
48+
static final String KEY_DISABLE_TESTS = "disableTests"
4949
static final String KEY_SUITE_PATH="suitePath"
5050
static final String KEY_INDENT_SPACES="indentSpaces"
5151
static final String KEY_GENERATE_FILES="generateFiles"

‎sqldev/src/main/java/org/utplsql/sqldev/oddgen/TestGenerator.xtend

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ import org.oddgen.sqldev.generators.model.Node
2727
import org.oddgen.sqldev.generators.model.NodeTools
2828
import org.oddgen.sqldev.plugin.templates.TemplateTools
2929
import org.utplsql.sqldev.dal.UtplsqlDao
30+
import org.utplsql.sqldev.model.oddgen.GenContext
3031
import org.utplsql.sqldev.model.preference.PreferenceModel
3132
import org.utplsql.sqldev.resources.UtplsqlResources
32-
import org.utplsql.sqldev.oddgen.model.GenContext
3333

3434
class TestGenerator implements OddgenGenerator2 {
3535

@@ -56,17 +56,17 @@ class TestGenerator implements OddgenGenerator2 {
5656
val context = new GenContext()
5757
context.objectType = node.toObjectType
5858
context.objectName = node.toObjectName
59-
context.generateFiles = node.params.get(GENERATE_FILES) == YES
60-
context.outputDirectory = node.params.get(OUTPUT_DIRECTORY)
59+
context.generateFiles = node.params.get(GENERATE_FILES) == YES
60+
context.outputDirectory = node.params.get(OUTPUT_DIRECTORY)
6161
context.testPackagePrefix = node.params.get(TEST_PACKAGE_PREFIX).toLowerCase
6262
context.testPackageSuffix = node.params.get(TEST_PACKAGE_SUFFIX).toLowerCase
6363
context.testUnitPrefix = node.params.get(TEST_UNIT_PREFIX).toLowerCase
6464
context.testUnitSuffix = node.params.get(TEST_UNIT_SUFFIX).toLowerCase
65-
context.numberOfTestsPerUnit = Integer.valueOf(node.params.get(NUMBER_OF_TESTS_PER_UNIT))
66-
context.generateComments = node.params.get(GENERATE_COMMENTS) == YES
67-
context.disableTests = node.params.get(DISABLE_TESTS) == YES
68-
context.suitePath = node.params.get(SUITE_PATH).toLowerCase
69-
context.indentSpaces = Integer.valueOf(node.params.get(INDENT_SPACES))
65+
context.numberOfTestsPerUnit = Integer.valueOf(node.params.get(NUMBER_OF_TESTS_PER_UNIT))
66+
context.generateComments = node.params.get(GENERATE_COMMENTS) == YES
67+
context.disableTests = node.params.get(DISABLE_TESTS) == YES
68+
context.suitePath = node.params.get(SUITE_PATH).toLowerCase
69+
context.indentSpaces = Integer.valueOf(node.params.get(INDENT_SPACES))
7070
return context
7171
}
7272

@@ -101,7 +101,7 @@ class TestGenerator implements OddgenGenerator2 {
101101
«ENDIF»
102102
«ENDIF»
103103
«ENDFOR»
104-
'''
104+
'''
105105

106106
override isSupported(Connection conn) {
107107
var ret = false

‎sqldev/src/main/java/org/utplsql/sqldev/oddgen/TestTemplate.xtend

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import java.time.LocalDateTime
1919
import java.time.format.DateTimeFormatter
2020
import java.util.List
2121
import org.utplsql.sqldev.dal.UtplsqlDao
22-
import org.utplsql.sqldev.oddgen.model.GenContext
22+
import org.utplsql.sqldev.model.oddgen.GenContext
2323

2424
class TestTemplate {
2525
var GenContext context

‎sqldev/src/main/resources/org/utplsql/sqldev/resources/accelerators.xml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<context scope="global">
2-
<preset name="Default">
3-
<map action="utplsql.test">
4-
<accel>alt shift T</accel>
5-
</map>
6-
<map action="utplsql.generate">
7-
<accel>alt shift G</accel>
8-
</map>
9-
</preset>
10-
<preset name="Default MacOS X">
11-
<map action="utplsql.test">
12-
<accel>alt shift T</accel>
13-
</map>
14-
<map action="utplsql.generate">
15-
<accel>alt shift G</accel>
16-
</map>
17-
</preset>
2+
<preset name="Default">
3+
<map action="utplsql.test">
4+
<accel>alt shift T</accel>
5+
</map>
6+
<map action="utplsql.generate">
7+
<accel>alt shift G</accel>
8+
</map>
9+
</preset>
10+
<preset name="Default MacOS X">
11+
<map action="utplsql.test">
12+
<accel>alt shift T</accel>
13+
</map>
14+
<map action="utplsql.generate">
15+
<accel>alt shift G</accel>
16+
</map>
17+
</preset>
1818
</context>

0 commit comments

Comments
 (0)