Skip to content

Commit 6ab085b

Browse files
bjeffriebjeffrie
committed
Update for SQL Developer 18.1
1 parent ea19570 commit 6ab085b

File tree

7 files changed

+61
-6
lines changed

7 files changed

+61
-6
lines changed

‎sqldeveloper/extension/.classpath‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
99
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/FXDiagram 0.35.0-SNAPSHOT"/>
1010
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/KIELER KLay Layouters v. 2015.02"/>
11-
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/SQLDeveloper 4.2"/>
11+
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/SQLDeveloper 18.1"/>
1212
<classpathentry kind="output" path="built/classes"/>
1313
</classpath>

‎sqldeveloper/extension/java/DependencyExample/DependencyExample.userlibraries‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<eclipse-userlibraries version="2">
33
<library name="FXDiagram 0.35.0-SNAPSHOT" systemlibrary="false">
44
<archive path="/extension/java/DependencyExample/lib/com.google.guava-15.0.0.v201403281430.jar"/>
5-
<archive path="/extension/java/DependencyExample/lib/de.cau.cs.kieler.kiml.graphviz.layouter-0.7.0.201506231527.jar"/>
5+
<archive path="/extension/java/DependencyExample/lib/de.cau.cs.kieler.kiml.graphviz.dot-0.7.1.201612130921.jar"/>
66
<archive path="/extension/java/DependencyExample/lib/de.fxdiagram.annotations-0.35.0-SNAPSHOT.jar"/>
77
<archive path="/extension/java/DependencyExample/lib/de.fxdiagram.core-0.35.0-SNAPSHOT.jar"/>
88
<archive path="/extension/java/DependencyExample/lib/de.fxdiagram.external-0.35.0-SNAPSHOT.jar"/>

‎sqldeveloper/extension/java/DependencyExample/src/oracle/db/example/sqldeveloper/extension/dependency/DependencyExampleController.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ private Editor openEditor(Context context) {
113113
*/
114114
@Override
115115
public boolean update(IdeAction action, Context context) {
116+
action.setEnabled(true);
116117
return true;
117118
}
118119

‎sqldeveloper/extension/java/DependencyExample/src/oracle/db/example/sqldeveloper/extension/dependency/control/DependencyExampleFxControl.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
import oracle.dbtools.raptor.ui.URLFileChooser;
4646
import oracle.dbtools.util.Logger;
4747
import oracle.ide.Ide;
48+
import oracle.ide.controls.WaitCursor;
4849

4950
/**
5051
* DependencyExampleFxControl an javaFX custom control to contain the vworkflow UI
@@ -183,14 +184,18 @@ public DependencyExampleModel getViewModel() {
183184

184185
/**
185186
* @param aViewModel the viewModel to set
187+
* @param waitCursor
186188
*/
187-
public void setViewModel(DependencyExampleModel aViewModel) {
189+
public void setViewModel(DependencyExampleModel aViewModel, final WaitCursor waitCursor) {
188190
viewModel = aViewModel;
189191
Platform.runLater(() -> {
190192
getViewModel().load();
191193
updateUI();
192194
diagram.applyCss();
193195
diagram.layout();
196+
SwingUtilities.invokeLater(() -> {
197+
waitCursor.hide();
198+
});
194199
});
195200
}
196201

‎sqldeveloper/extension/java/DependencyExample/src/oracle/db/example/sqldeveloper/extension/dependency/viewer/DependencyExampleGraphViewer.java‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import java.awt.BorderLayout;
2020
import java.awt.Component;
21+
import java.awt.Cursor;
2122
import java.util.Collections;
2223

2324
import javafx.application.Platform;
@@ -48,6 +49,7 @@
4849
import oracle.dbtools.util.Logger;
4950
import oracle.ide.Context;
5051
import oracle.ide.Ide;
52+
import oracle.ide.controls.WaitCursor;
5153
import oracle.ide.editor.AsynchronousEditor;
5254
import oracle.ide.editor.EditorManager;
5355
import oracle.ide.model.UpdateMessage;
@@ -210,7 +212,7 @@ private void initFX(JFXPanel fxPanel) {
210212
try {
211213
dependencyExampleFxControl = new DependencyExampleFxControl();
212214
Scene scene = SceneFactory.createScene(dependencyExampleFxControl.getRoot());
213-
scene.setCamera(new PerspectiveCamera());
215+
// GPU turned off in sqldev 18.1 scene.setCamera(new PerspectiveCamera());
214216
fxPanel.setScene(scene);
215217
}
216218
catch(Exception e) {
@@ -230,6 +232,8 @@ private void loadContentModel(Context context) {
230232
return;
231233
}
232234
}
235+
final WaitCursor waitCursor = new WaitCursor(Ide.getMainWindow());
236+
waitCursor.show();
233237
dbObject = new DBObject(context.getNode());
234238
multipleSelections = context.getSelection().length > 1;
235239
dependencyModel = new DependencyExampleModel(context);
@@ -245,7 +249,9 @@ protected Object doWork() throws TaskException {
245249
@Override
246250
protected void invokeLater() {
247251
// This is only called if the task finishes and is on the UI thread
248-
dependencyExampleFxControl.setViewModel(dependencyModel);
252+
dependencyExampleFxControl.setViewModel(dependencyModel, waitCursor);
253+
// Force update UI
254+
EditorManager.getEditorManager().refreshEditorUI(DependencyExampleGraphViewer.this);
249255
}
250256

251257
@Override

‎sqldeveloper/extension/java/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
## Standard Extensions (java)
33
Standard extensions are jar files with an [OSGi](https://en.wikipedia.org/wiki/OSGi) manifest and an extension.xml defining the extension and how it integrates with SQL Developer.
44

5-
[Set up your environment](../setup.md). If using the eclipse project, also modify paths in *SQLDeveloper4.2.userlibraries* and import into eclipse.
5+
[Set up your environment](../setup.md). If using the eclipse project, also modify paths in *SQLDeveloper18.1.userlibraries* and import into eclipse.
66

77
* [packaged XML](../xml/packaged)
88
XML Examples packaged as an extension.jar

‎sqldeveloper/extension/java/SQLDeveloper18.1.userlibraries‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2+
<eclipse-userlibraries version="2">
3+
<library name="FXDiagram 0.35.0-SNAPSHOT" systemlibrary="false">
4+
<archive path="/extension/java/DependencyExample/lib/com.google.guava-15.0.0.v201403281430.jar"/>
5+
<archive path="/extension/java/DependencyExample/lib/de.fxdiagram.annotations-0.35.0-SNAPSHOT.jar"/>
6+
<archive path="/extension/java/DependencyExample/lib/de.fxdiagram.core-0.35.0-SNAPSHOT.jar"/>
7+
<archive path="/extension/java/DependencyExample/lib/de.fxdiagram.external-0.35.0-SNAPSHOT.jar"/>
8+
<archive path="/extension/java/DependencyExample/lib/de.fxdiagram.lib-0.35.0-SNAPSHOT.jar"/>
9+
<archive path="/extension/java/DependencyExample/lib/org.eclipse.emf.common-2.11.1.v20160208-0816.jar"/>
10+
<archive path="/extension/java/DependencyExample/lib/org.eclipse.emf.ecore-2.11.2.v20160208-0816.jar"/>
11+
<archive path="/extension/java/DependencyExample/lib/org.eclipse.emf.ecore.xmi-2.11.1.v20160208-0816.jar"/>
12+
<archive path="/extension/java/DependencyExample/lib/org.eclipse.xtend.lib-2.10.0.v201605250459.jar"/>
13+
<archive path="/extension/java/DependencyExample/lib/org.eclipse.xtext.xbase.lib-2.10.0.v201605250459.jar"/>
14+
<archive path="/extension/java/DependencyExample/lib/de.cau.cs.kieler.kiml.graphviz.dot-0.7.1.201612130921.jar"/>
15+
</library>
16+
<library name="KIELER KLay Layouters v. 2015.02" systemlibrary="false">
17+
<archive path="/extension/java/DependencyExample/lib/klay_2015-02.jar"/>
18+
</library>
19+
<library name="SQLDeveloper 18.1" systemlibrary="false">
20+
<archive path="D:/sqldeveloper-18.1.0/sqldeveloper/ide/extensions/oracle.ide.db.jar"/>
21+
<archive path="D:/sqldeveloper-18.1.0/sqldeveloper/ide/extensions/oracle.ide.jar" source="D:/workspace2/raptor_18.1/raptorbase-src.latest.jar"/>
22+
<archive path="D:/sqldeveloper-18.1.0/sqldeveloper/ide/lib/idert.jar" source="D:/workspace2/raptor_18.1/raptorbase-src.latest.jar"/>
23+
<archive path="D:/sqldeveloper-18.1.0/sqldeveloper/ide/lib/javatools.jar"/>
24+
<archive path="D:/sqldeveloper-18.1.0/sqldeveloper/modules/oracle.javatools/javatools-nodeps.jar"/>
25+
<archive path="D:/sqldeveloper-18.1.0/sqldeveloper/modules/oracle.javatools/oicons.jar"/>
26+
<archive path="D:/sqldeveloper-18.1.0/sqldeveloper/sqldeveloper/extensions/oracle.sqldeveloper.jar"/>
27+
<archive path="D:/sqldeveloper-18.1.0/sqldeveloper/sqldeveloper/extensions/oracle.sqldeveloper.utils.jar"/>
28+
<archive path="D:/sqldeveloper-18.1.0/sqldeveloper/sqldeveloper/lib/dbtools-common.jar"/>
29+
<archive path="D:/sqldeveloper-18.1.0/sqldeveloper/sqldeveloper/lib/oracle.sqldeveloper.jfx-nodeps.jar"/>
30+
</library>
31+
<library name="SQLDeveloper 4.2" systemlibrary="false">
32+
<archive path="D:/sqldeveloper-4.2.0.17.089.1709/sqldeveloper/ide/extensions/oracle.ide.db.jar"/>
33+
<archive path="D:/sqldeveloper-4.2.0.17.089.1709/sqldeveloper/ide/extensions/oracle.ide.jar"/>
34+
<archive path="D:/sqldeveloper-4.2.0.17.089.1709/sqldeveloper/ide/lib/idert.jar"/>
35+
<archive path="D:/sqldeveloper-4.2.0.17.089.1709/sqldeveloper/ide/lib/javatools.jar"/>
36+
<archive path="D:/sqldeveloper-4.2.0.17.089.1709/sqldeveloper/modules/oracle.javatools/javatools-nodeps.jar"/>
37+
<archive path="D:/sqldeveloper-4.2.0.17.089.1709/sqldeveloper/modules/oracle.javatools/oicons.jar"/>
38+
<archive path="D:/sqldeveloper-4.2.0.17.089.1709/sqldeveloper/sqldeveloper/extensions/oracle.sqldeveloper.jar"/>
39+
<archive path="D:/sqldeveloper-4.2.0.17.089.1709/sqldeveloper/sqldeveloper/extensions/oracle.sqldeveloper.utils.jar"/>
40+
<archive path="D:/sqldeveloper-4.2.0.17.089.1709/sqldeveloper/sqldeveloper/lib/oracle.dbtools-common.jar"/>
41+
<archive path="D:/sqldeveloper-4.2.0.17.089.1709/sqldeveloper/sqldeveloper/lib/oracle.sqldeveloper.jfx-nodeps.jar"/>
42+
</library>
43+
</eclipse-userlibraries>

0 commit comments

Comments
 (0)