Skip to content

Commit 60f222d

Browse files
Merge pull request #115 from PhilippSalvisberg/bugfix/issue-111-schema-browser
Bugfix/issue 111 schema browser
2 parents fa54c8b + 75f25ed commit 60f222d

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

sqldev/pom.xml

+8
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,13 @@
108108
<scope>system</scope>
109109
<systemPath>${sqldev.basedir}/sqldeveloper/extensions/oracle.sqldeveloper.worksheet.jar</systemPath>
110110
</dependency>
111+
<dependency>
112+
<groupId>oracle</groupId>
113+
<artifactId>oracle.sqldeveloper.schemabrowser</artifactId>
114+
<version>19.3.0</version>
115+
<scope>system</scope>
116+
<systemPath>${sqldev.basedir}/sqldeveloper/extensions/oracle.sqldeveloper.schemabrowser.jar</systemPath>
117+
</dependency>
111118
<dependency>
112119
<groupId>oracle</groupId>
113120
<artifactId>ojdbc8</artifactId>
@@ -445,6 +452,7 @@
445452
oracle.ide.db,
446453
oracle.ide.runner,
447454
oracle.sqldeveloper,
455+
oracle.sqldeveloper.schemabrowser,
448456
oracle.sqldeveloper.utils,
449457
oracle.sqldeveloper.worksheet,
450458
oracle.uic

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

+6-5
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
import oracle.dbtools.raptor.navigator.impl.ObjectFolder;
5151
import oracle.dbtools.raptor.navigator.impl.SchemaFolder;
5252
import oracle.dbtools.raptor.navigator.plsql.PlSqlNode;
53+
import oracle.dbtools.raptor.schemabrowser.view.SBWindow;
5354
import oracle.dbtools.raptor.utils.Connections;
5455
import oracle.dbtools.worksheet.editor.Worksheet;
5556
import oracle.ide.Context;
@@ -135,7 +136,7 @@ public boolean update(final IdeAction action, final Context context) {
135136
action.setEnabled(true);
136137
}
137138
}
138-
} else if (view instanceof DBNavigatorWindow) {
139+
} else if (view instanceof DBNavigatorWindow || view instanceof SBWindow) {
139140
action.setEnabled(true);
140141
// disable action if a node in the selection is not runnable
141142
for (int i = 0; i < context.getSelection().length; i++) {
@@ -192,7 +193,7 @@ public boolean update(final IdeAction action, final Context context) {
192193
action.setEnabled(true);
193194
}
194195
}
195-
} else if (view instanceof DBNavigatorWindow) {
196+
} else if (view instanceof DBNavigatorWindow || view instanceof SBWindow) {
196197
// multiselection is not supported, use oddgen to generte tests for multiple objects
197198
if (context.getSelection().length == 1) {
198199
final Object element = context.getSelection()[0];
@@ -367,7 +368,7 @@ public void runTest(final Context context, boolean withDebug) {
367368
worksheet.runTestAsync();
368369
}
369370
}
370-
} else if (view instanceof DBNavigatorWindow) {
371+
} else if (view instanceof DBNavigatorWindow || view instanceof SBWindow) {
371372
final URL url = getURL(context);
372373
if (url != null) {
373374
final String connectionName = URLTools.getConnectionName(url);
@@ -469,7 +470,7 @@ public void codeCoverage(final Context context) {
469470
final CodeCoverageReporter reporter = new CodeCoverageReporter(getPathList(path), includeObjectList, connectionName);
470471
reporter.showParameterWindow();
471472
}
472-
} else if (view instanceof DBNavigatorWindow) {
473+
} else if (view instanceof DBNavigatorWindow || view instanceof SBWindow) {
473474
logger.finer("Code coverage from DB navigator");
474475
final URL url = getURL(context);
475476
if (url != null) {
@@ -529,7 +530,7 @@ public void generateTest(final Context context) {
529530
}
530531
}
531532
} else {
532-
if (view instanceof DBNavigatorWindow) {
533+
if (view instanceof DBNavigatorWindow || view instanceof SBWindow) {
533534
final URL url = getURL(context);
534535
if (url != null) {
535536
final String connectionName = URLTools.getConnectionName(url);

0 commit comments

Comments
 (0)