Skip to content

Commit 3ee05bd

Browse files
PhilippSalvisbergPhilippSalvisberg
committed
rename classes and packages
1 parent b56a700 commit 3ee05bd

File tree

15 files changed

+57
-35
lines changed

15 files changed

+57
-35
lines changed

‎sqldev/extension.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@
158158
<settings-ui-hook>
159159
<page id="UTPLSQL_PREFERENCES_PAGE" parent-idref="/preferences">
160160
<label>${PREF_LABEL}</label>
161-
<traversable-class>org.utplsql.sqldev.PreferencePanel
161+
<traversable-class>org.utplsql.sqldev.ui.preference.PreferencePanel
162162
</traversable-class>
163163
</page>
164164
</settings-ui-hook>

sqldev/src/main/java/org/utplsql/sqldev/CodeCoverageReporter.xtend renamed to sqldev/src/main/java/org/utplsql/sqldev/coverage/CodeCoverageReporter.xtend

Lines changed: 5 additions & 4 deletions
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
16+
package org.utplsql.sqldev.coverage
1717

1818
import java.awt.Desktop
1919
import java.io.File
@@ -27,14 +27,15 @@ import java.util.List
2727
import java.util.logging.Logger
2828
import oracle.dbtools.raptor.utils.Connections
2929
import org.utplsql.sqldev.dal.UtplsqlDao
30+
import org.utplsql.sqldev.ui.coverage.CodeCoverageReporterDialog
3031

3132
class CodeCoverageReporter {
3233
static val Logger logger = Logger.getLogger(CodeCoverageReporter.name);
3334

3435
var Connection conn
3536
var List<String> pathList
3637
var List<String> includeObjectList
37-
var CodeCoverageReporterWindow frame
38+
var CodeCoverageReporterDialog frame
3839
var String schemas
3940
var String includeObjects
4041
var String excludeObjects
@@ -100,7 +101,7 @@ class CodeCoverageReporter {
100101
}
101102
}
102103

103-
def setFrame(CodeCoverageReporterWindow frame) {
104+
def setFrame(CodeCoverageReporterDialog frame) {
104105
this.frame = frame;
105106
}
106107

@@ -145,7 +146,7 @@ class CodeCoverageReporter {
145146
}
146147

147148
def showParameterWindow() {
148-
CodeCoverageReporterWindow.createAndShow(this)
149+
CodeCoverageReporterDialog.createAndShow(this)
149150
}
150151

151152
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ import oracle.ide.config.Preferences
3636
import oracle.ide.controller.Controller
3737
import oracle.ide.controller.IdeAction
3838
import oracle.ide.editor.Editor
39-
import org.utplsql.sqldev.CodeCoverageReporter
40-
import org.utplsql.sqldev.UtplsqlWorksheet
39+
import org.utplsql.sqldev.coverage.CodeCoverageReporter
4140
import org.utplsql.sqldev.dal.UtplsqlDao
4241
import org.utplsql.sqldev.model.URLTools
4342
import org.utplsql.sqldev.model.oddgen.GenContext
4443
import org.utplsql.sqldev.model.preference.PreferenceModel
4544
import org.utplsql.sqldev.oddgen.TestTemplate
4645
import org.utplsql.sqldev.parser.UtplsqlParser
46+
import org.utplsql.sqldev.runner.UtplsqlWorksheetRunner
4747

4848
class UtplsqlController implements Controller {
4949
static final Logger logger = Logger.getLogger(UtplsqlController.name);
@@ -281,7 +281,7 @@ class UtplsqlController implements Controller {
281281
val parser = new UtplsqlParser(component.text, if (preferences.checkRunUtplsqlTest) {Connections.instance.getConnection(connectionName)} else {null}, owner)
282282
val position = component.caretPosition
283283
val path = parser.getPathAt(position)
284-
val utPlsqlWorksheet = new UtplsqlWorksheet(path.pathList, connectionName)
284+
val utPlsqlWorksheet = new UtplsqlWorksheetRunner(path.pathList, connectionName)
285285
utPlsqlWorksheet.runTestAsync
286286
}
287287
} else if (view instanceof DBNavigatorWindow) {
@@ -290,7 +290,7 @@ class UtplsqlController implements Controller {
290290
val connectionName = url.connectionName
291291
logger.fine('''connectionName: «connectionName»''')
292292
val pathList=context.pathList.dedupPathList
293-
val utPlsqlWorksheet = new UtplsqlWorksheet(pathList, connectionName)
293+
val utPlsqlWorksheet = new UtplsqlWorksheetRunner(pathList, connectionName)
294294
utPlsqlWorksheet.runTestAsync
295295
}
296296
}
@@ -388,7 +388,7 @@ class UtplsqlController implements Controller {
388388
populateGenContext(genContext, preferences)
389389
val testTemplate = new TestTemplate(genContext)
390390
val code = testTemplate.generate.toString
391-
UtplsqlWorksheet.openWithCode(code, connectionName)
391+
UtplsqlWorksheetRunner.openWithCode(code, connectionName)
392392
}
393393
}
394394
}
@@ -400,7 +400,7 @@ class UtplsqlController implements Controller {
400400
val connectionName = url.connectionName
401401
val testTemplate = new TestTemplate(context.genContext)
402402
val code = testTemplate.generate.toString
403-
UtplsqlWorksheet.openWithCode(code, connectionName)
403+
UtplsqlWorksheetRunner.openWithCode(code, connectionName)
404404
}
405405
}
406406
}

sqldev/src/main/java/org/utplsql/sqldev/UtplsqlWorksheet.xtend renamed to sqldev/src/main/java/org/utplsql/sqldev/runner/UtplsqlWorksheetRunner.xtend

Lines changed: 3 additions & 3 deletions
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
16+
package org.utplsql.sqldev.runner
1717

1818
import java.util.List
1919
import java.util.logging.Logger
@@ -28,8 +28,8 @@ import oracle.ide.controller.IdeAction
2828
import org.utplsql.sqldev.model.preference.PreferenceModel
2929
import org.utplsql.sqldev.resources.UtplsqlResources
3030

31-
class UtplsqlWorksheet {
32-
static val Logger logger = Logger.getLogger(UtplsqlWorksheet.name);
31+
class UtplsqlWorksheetRunner {
32+
static val Logger logger = Logger.getLogger(UtplsqlWorksheetRunner.name);
3333

3434
var PreferenceModel preferences
3535
var String connectionName

sqldev/src/main/java/org/utplsql/sqldev/DirectoryChooser.xtend renamed to sqldev/src/main/java/org/utplsql/sqldev/ui/common/DirectoryChooser.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
16+
package org.utplsql.sqldev.ui.common
1717

1818
import java.io.File
1919
import java.util.logging.Logger

sqldev/src/main/java/org/utplsql/sqldev/CodeCoverageReporterWindow.xtend renamed to sqldev/src/main/java/org/utplsql/sqldev/ui/coverage/CodeCoverageReporterDialog.xtend

Lines changed: 7 additions & 6 deletions
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
16+
package org.utplsql.sqldev.ui.coverage
1717

1818
import java.awt.Component
1919
import java.awt.Dimension
@@ -38,9 +38,10 @@ import javax.swing.JTextField
3838
import javax.swing.ScrollPaneConstants
3939
import javax.swing.SwingUtilities
4040
import org.springframework.core.task.SimpleAsyncTaskExecutor
41+
import org.utplsql.sqldev.coverage.CodeCoverageReporter
4142
import org.utplsql.sqldev.resources.UtplsqlResources
4243

43-
class CodeCoverageReporterWindow extends JFrame implements ActionListener, FocusListener {
44+
class CodeCoverageReporterDialog extends JFrame implements ActionListener, FocusListener {
4445

4546
var CodeCoverageReporter reporter
4647
var JButton runButton
@@ -55,14 +56,14 @@ class CodeCoverageReporterWindow extends JFrame implements ActionListener, Focus
5556
def static createAndShow(CodeCoverageReporter reporter) {
5657
SwingUtilities.invokeLater(new Runnable() {
5758
override run() {
58-
CodeCoverageReporterWindow.createAndShowWithinEventThread(reporter);
59+
CodeCoverageReporterDialog.createAndShowWithinEventThread(reporter);
5960
}
6061
});
6162
}
6263

6364
def private static createAndShowWithinEventThread(CodeCoverageReporter reporter) {
6465
// create and layout the dialog
65-
val frame = new CodeCoverageReporterWindow(reporter)
66+
val frame = new CodeCoverageReporterDialog(reporter)
6667
reporter.frame = frame
6768
frame.pack
6869
// center dialog
@@ -75,7 +76,7 @@ class CodeCoverageReporterWindow extends JFrame implements ActionListener, Focus
7576
new(CodeCoverageReporter reporter) {
7677
super(UtplsqlResources.getString("WINDOW_CODE_COVERAGE_REPORT_LABEL"))
7778
this.reporter = reporter
78-
val pane = this.getContentPane();
79+
val pane = getContentPane();
7980
pane.setLayout(new GridBagLayout());
8081
val c = new GridBagConstraints();
8182

@@ -169,7 +170,7 @@ class CodeCoverageReporterWindow extends JFrame implements ActionListener, Focus
169170
}
170171

171172
def exit() {
172-
this.dispatchEvent(new WindowEvent(this, WindowEvent.WINDOW_CLOSING));
173+
dispatchEvent(new WindowEvent(this, WindowEvent.WINDOW_CLOSING));
173174
}
174175

175176
override actionPerformed(ActionEvent e) {

sqldev/src/main/java/org/utplsql/sqldev/PreferencePanel.xtend renamed to sqldev/src/main/java/org/utplsql/sqldev/ui/preference/PreferencePanel.xtend

Lines changed: 2 additions & 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
16+
package org.utplsql.sqldev.ui.preference
1717

1818
import java.awt.event.ActionEvent
1919
import java.awt.event.ActionListener
@@ -33,6 +33,7 @@ import oracle.ide.panels.TraversalException
3333
import oracle.javatools.ui.layout.FieldLayoutBuilder
3434
import org.utplsql.sqldev.model.preference.PreferenceModel
3535
import org.utplsql.sqldev.resources.UtplsqlResources
36+
import org.utplsql.sqldev.ui.common.DirectoryChooser
3637

3738
class PreferencePanel extends DefaultTraversablePanel {
3839
val JPanel runTestPanel = new JPanel();

sqldev/src/test/java/org/utplsql/sqldev/tests/AbstractJdbcTest.xtend renamed to sqldev/src/test/java/org/utplsql/sqldev/test/AbstractJdbcTest.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.tests
16+
package org.utplsql.sqldev.test
1717

1818
import java.io.StringReader
1919
import java.util.ArrayList

sqldev/src/test/java/org/utplsql/sqldev/tests/ResourceTest.xtend renamed to sqldev/src/test/java/org/utplsql/sqldev/test/ResourceTest.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.tests
16+
package org.utplsql.sqldev.test
1717

1818
import org.junit.Assert
1919
import org.junit.Test

sqldev/src/test/java/org/utplsql/sqldev/tests/UrlToolsTest.xtend renamed to sqldev/src/test/java/org/utplsql/sqldev/test/UrlToolsTest.xtend

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,19 @@
1-
package org.utplsql.sqldev.tests
1+
/*
2+
* Copyright 2018 Philipp Salvisberg <philipp.salvisberg@trivadis.com>
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
package org.utplsql.sqldev.test
217

318
import org.junit.Assert
419
import org.junit.Test

0 commit comments

Comments
 (0)