Skip to content

Commit 45a6462

Browse files
benfrybenfry
committed
updates to fix packaging change
1 parent 72d5c0c commit 45a6462

File tree

8 files changed

+82
-64
lines changed

8 files changed

+82
-64
lines changed

‎src/processing/mode/android/AndroidEditor.java

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,13 @@
2121

2222
package processing.mode.android;
2323

24-
import processing.app.*;
24+
import processing.app.Base;
25+
import processing.app.Mode;
26+
import processing.app.Preferences;
27+
import processing.app.SketchException;
28+
import processing.app.ui.EditorState;
29+
import processing.app.ui.EditorToolbar;
30+
import processing.app.ui.Toolkit;
2531
import processing.core.PApplet;
2632
import processing.mode.java.JavaEditor;
2733

@@ -36,6 +42,7 @@
3642
import java.util.ArrayList;
3743
import java.util.TimerTask;
3844

45+
3946
@SuppressWarnings("serial")
4047
public class AndroidEditor extends JavaEditor {
4148
private AndroidMode androidMode;
@@ -55,7 +62,7 @@ public void run() {
5562
final Devices devices = Devices.getInstance();
5663
java.util.List<Device> deviceList = devices.findMultiple(false);
5764
Device selectedDevice = devices.getSelectedDevice();
58-
65+
5966
if (deviceList.size() == 0) {
6067
//if (deviceMenu.getItem(0).isEnabled()) {
6168
if (0 < deviceMenu.getItemCount()) {
@@ -121,7 +128,9 @@ public void actionPerformed(ActionEvent e) {
121128
}
122129
}
123130

124-
protected AndroidEditor(Base base, String path, EditorState state, Mode mode) throws Exception {
131+
132+
protected AndroidEditor(Base base, String path,
133+
EditorState state, Mode mode) throws Exception {
125134
super(base, path, state, mode);
126135
androidMode = (AndroidMode) mode;
127136
androidMode.checkSDK(this);
@@ -240,7 +249,7 @@ public void run() {
240249

241250
menu.add(sdkMenu);
242251
menu.addSeparator();
243-
252+
244253
final JMenu abiMenu = new JMenu("Select CPU/ABI");
245254
for (int i = 0; i < AVD.ABI.length; ++i) {
246255
JMenuItem menuItem = new JCheckBoxMenuItem(AVD.ABI[i]);
@@ -249,7 +258,7 @@ public void run() {
249258
menuItem.setSelected(true);
250259
}
251260
}
252-
261+
253262
for (int i = 0; i < abiMenu.getItemCount(); ++i) {
254263
final JMenuItem abiItem = abiMenu.getItem(i);
255264
abiItem.addActionListener(new ActionListener() {
@@ -263,7 +272,7 @@ public void actionPerformed(ActionEvent e) {
263272
}
264273
});
265274
}
266-
275+
267276
menu.add(abiMenu);
268277
menu.addSeparator();
269278

@@ -569,7 +578,7 @@ public void handleExportProject() {
569578
new Thread() {
570579
public void run() {
571580
// toolbar.activate(AndroidToolbar.EXPORT);
572-
((AndroidToolbar)toolbar).activateExport();
581+
((AndroidToolbar) toolbar).activateExport();
573582
startIndeterminate();
574583
statusNotice("Exporting a debug version of the sketch...");
575584
AndroidBuild build = new AndroidBuild(sketch, androidMode);

‎src/processing/mode/android/AndroidMode.java

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,14 @@
2121

2222
package processing.mode.android;
2323

24-
import processing.app.*;
24+
import processing.app.Base;
25+
import processing.app.Library;
26+
import processing.app.Preferences;
27+
import processing.app.RunnerListener;
28+
import processing.app.Sketch;
29+
import processing.app.SketchException;
30+
import processing.app.ui.Editor;
31+
import processing.app.ui.EditorState;
2532
import processing.mode.java.JavaMode;
2633

2734
import java.io.File;
@@ -57,11 +64,11 @@ public Editor createEditor(Base base, String path, EditorState state) {
5764
public String getTitle() {
5865
return "Android";
5966
}
60-
61-
67+
68+
6269
public File[] getKeywordFiles() {
63-
return new File[] {
64-
Base.getContentFile("modes/java/keywords.txt")
70+
return new File[] {
71+
Base.getContentFile("modes/java/keywords.txt")
6572
};
6673
}
6774

@@ -209,7 +216,8 @@ public void handleRunEmulator(Sketch sketch, RunnerListener listener) throws Ske
209216
}
210217

211218

212-
public void handleRunDevice(Sketch sketch, RunnerListener listener) throws SketchException, IOException {
219+
public void handleRunDevice(Sketch sketch, RunnerListener listener)
220+
throws SketchException, IOException {
213221
// JavaBuild build = new JavaBuild(sketch);
214222
// String appletClassName = build.build();
215223
// if (appletClassName != null) {

‎src/processing/mode/android/AndroidRunner.java

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import java.util.regex.Matcher;
2929
import java.util.regex.Pattern;
3030

31-
import processing.app.Editor;
31+
import processing.app.ui.Editor;
3232
import processing.app.RunnerListener;
3333
import processing.app.SketchException;
3434
import processing.mode.java.runner.Runner;
@@ -37,15 +37,15 @@
3737
public class AndroidRunner implements DeviceListener {
3838
AndroidBuild build;
3939
RunnerListener listener;
40-
40+
4141
protected PrintStream sketchErr;
4242
protected PrintStream sketchOut;
4343

44-
44+
4545
public AndroidRunner(AndroidBuild build, RunnerListener listener) {
4646
this.build = build;
4747
this.listener = listener;
48-
48+
4949
if (listener instanceof Editor) {
5050
Editor editor = (Editor) listener;
5151
sketchErr = editor.getConsole().getErr();
@@ -55,8 +55,8 @@ public AndroidRunner(AndroidBuild build, RunnerListener listener) {
5555
sketchOut = System.out;
5656
}
5757
}
58-
59-
58+
59+
6060
public void launch(Future<Device> deviceFuture) {
6161
// try {
6262
// runSketchOnDevice(Devices.getInstance().getEmulator(), "debug", AndroidEditor.this);
@@ -70,7 +70,7 @@ public void launch(Future<Device> deviceFuture) {
7070
final Device device = waitForDevice(deviceFuture, listener);
7171
if (device == null || !device.isAlive()) {
7272
listener.statusError("Lost connection with device while launching. Try again.");
73-
// Reset the server, in case that's the problem. Sometimes when
73+
// Reset the server, in case that's the problem. Sometimes when
7474
// launching the emulator times out, the device list refuses to update.
7575
Devices.killAdbServer();
7676
return;
@@ -91,7 +91,7 @@ public void launch(Future<Device> deviceFuture) {
9191
Devices.killAdbServer(); // see above
9292
return;
9393
}
94-
// if (!build.antInstall()) {
94+
// if (!build.antInstall()) {
9595
// }
9696

9797
// if (monitor.isCanceled()) {
@@ -115,8 +115,8 @@ public void launch(Future<Device> deviceFuture) {
115115
//listener.stopIndeterminate();
116116
//}
117117
}
118-
119-
118+
119+
120120
private volatile Device lastRunDevice = null;
121121

122122
/**
@@ -132,7 +132,7 @@ private void runSketchOnDevice(Sketch sketch,
132132
// "Building and launching...",
133133
// "Creating project...");
134134
135-
135+
136136
AndroidBuild build = new AndroidBuild(sketch, listener);
137137
try {
138138
try {
@@ -207,7 +207,7 @@ private void runSketchOnDevice(Sketch sketch,
207207
}
208208
*/
209209

210-
210+
211211
// if user asks for 480x320, 320x480, 854x480 etc, then launch like that
212212
// though would need to query the emulator to see if it can do that
213213

@@ -248,8 +248,8 @@ private Device waitForDevice(Future<Device> deviceFuture, RunnerListener listene
248248
"on waiting for that device to show up.");
249249
return null;
250250
}
251-
252-
251+
252+
253253
private static final Pattern LOCATION =
254254
Pattern.compile("\\(([^:]+):(\\d+)\\)");
255255
private static final Pattern EXCEPTION_PARSER =
@@ -304,7 +304,7 @@ public void close() {
304304
}
305305

306306

307-
// sketch stopped on the device
307+
// sketch stopped on the device
308308
public void sketchStopped() {
309309
listener.stopIndeterminate();
310310
listener.statusHalt();

‎src/processing/mode/android/AndroidToolbar.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
import java.util.List;
2727

2828
import processing.app.Base;
29-
import processing.app.Editor;
30-
import processing.app.EditorButton;
31-
import processing.app.EditorToolbar;
29+
import processing.app.ui.Editor;
30+
import processing.app.ui.EditorButton;
31+
import processing.app.ui.EditorToolbar;
3232
import processing.app.Language;
3333

3434

@@ -57,7 +57,7 @@ public AndroidToolbar(Editor editor, Base base) {
5757
// }
5858
// }
5959

60-
60+
6161
static public String getTitle(int index, boolean shift) {
6262
switch (index) {
6363
case RUN: return !shift ? "Run on Device" : "Run in Emulator";
@@ -116,7 +116,7 @@ public void handlePressed(MouseEvent e, int sel) {
116116
}
117117
}
118118
*/
119-
119+
120120
@Override
121121
public List<EditorButton> createButtons() {
122122
ArrayList<EditorButton> toReturn = new ArrayList<EditorButton>();
@@ -161,14 +161,14 @@ public void handleStop() {
161161
AndroidEditor aEditor = (AndroidEditor) editor;
162162
aEditor.handleStop();
163163
}
164-
165-
164+
165+
166166
public void activateExport() {
167167
// TODO added to match the new API in EditorToolbar (activateRun, etc).
168168
}
169169

170170

171171
public void deactivateExport() {
172172
// TODO added to match the new API in EditorToolbar (activateRun, etc).
173-
}
173+
}
174174
}

‎src/processing/mode/android/KeyStoreManager.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package processing.mode.android;
22

33
import processing.app.Base;
4-
import processing.app.Preferences;
4+
import processing.app.ui.Toolkit;
55

66
import javax.swing.*;
77
import javax.swing.border.EmptyBorder;
@@ -61,7 +61,7 @@ private void createLayout() {
6161
JPanel buttons = new JPanel();
6262
buttons.setAlignmentX(LEFT_ALIGNMENT);
6363
JButton okButton = new JButton("OK");
64-
Dimension dim = new Dimension(Preferences.BUTTON_WIDTH,
64+
Dimension dim = new Dimension(Toolkit.BUTTON_WIDTH,
6565
okButton.getPreferredSize().height);
6666
okButton.setPreferredSize(dim);
6767
okButton.addActionListener(new ActionListener() {
@@ -97,7 +97,7 @@ public void actionPerformed(ActionEvent e) {
9797
cancelButton.setEnabled(true);
9898

9999
JButton resetKeystoreButton = new JButton("Reset password");
100-
dim = new Dimension(Preferences.BUTTON_WIDTH*2,
100+
dim = new Dimension(Toolkit.BUTTON_WIDTH*2,
101101
okButton.getPreferredSize().height);
102102
resetKeystoreButton.setPreferredSize(dim);
103103
resetKeystoreButton.addActionListener(new ActionListener() {
@@ -147,17 +147,17 @@ public void actionPerformed(ActionEvent actionEvent) {
147147
setVisible(false);
148148
}
149149
};
150-
processing.app.Toolkit.registerWindowCloseKeys(root, disposer);
151-
processing.app.Toolkit.setIcon(this);
150+
Toolkit.registerWindowCloseKeys(root, disposer);
151+
Toolkit.setIcon(this);
152152

153153
pack();
154-
155-
Dimension screen = processing.app.Toolkit.getScreenSize();
154+
/*
155+
Dimension screen = Toolkit.getScreenSize();
156156
Dimension windowSize = getSize();
157-
158157
setLocation((screen.width - windowSize.width) / 2,
159158
(screen.height - windowSize.height) / 2);
160-
159+
*/
160+
setLocationRelativeTo(null);
161161
setVisible(true);
162162
}
163163

‎src/processing/mode/android/Keys.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,10 @@
2121

2222
package processing.mode.android;
2323

24-
//import java.awt.*;
25-
//import java.awt.event.*;
26-
//import java.util.ArrayList;
27-
//import java.util.HashMap;
28-
2924
import javax.swing.*;
3025

31-
import processing.app.*;
26+
import processing.app.ui.Editor;
27+
3228

3329
@SuppressWarnings("serial")
3430
public class Keys extends JFrame {

‎src/processing/mode/android/Permissions.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,8 @@
3333
import javax.swing.event.*;
3434

3535
import processing.app.Base;
36-
import processing.app.Preferences;
3736
import processing.app.Sketch;
38-
import processing.app.Toolkit;
37+
import processing.app.ui.Toolkit;
3938

4039

4140
@SuppressWarnings("serial")
@@ -241,7 +240,7 @@ public void mouseClicked(MouseEvent e) {
241240
// Box buttons = Box.createHorizontalBox();
242241
buttons.setAlignmentX(LEFT_ALIGNMENT);
243242
JButton okButton = new JButton("OK");
244-
Dimension dim = new Dimension(Preferences.BUTTON_WIDTH,
243+
Dimension dim = new Dimension(Toolkit.BUTTON_WIDTH,
245244
okButton.getPreferredSize().height);
246245
okButton.setPreferredSize(dim);
247246
okButton.addActionListener(new ActionListener() {
@@ -539,7 +538,7 @@ public void mousePressed(MouseEvent e) {
539538

540539

541540
protected class CellRenderer implements ListCellRenderer<JCheckBox> {
542-
public Component getListCellRendererComponent(JList<? extends JCheckBox> list,
541+
public Component getListCellRendererComponent(JList<? extends JCheckBox> list,
543542
JCheckBox checkbox,
544543
int index, boolean isSelected,
545544
boolean cellHasFocus) {

0 commit comments

Comments
 (0)