Skip to content

Commit 25bb629

Browse files
codeanticodecodeanticode
committed
don't use language strings for the mode tools for the time being
1 parent ea93b61 commit 25bb629

5 files changed

Lines changed: 80 additions & 40 deletions

File tree

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

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,7 @@ protected AndroidEditor(Base base, String path, EditorState state,
8282
androidMode.resetUserSelection();
8383
androidMode.checkSDK(this);
8484

85-
debugger = new AndroidDebugger(this, androidMode);
86-
// Set saved breakpoints when sketch is opened for the first time
87-
for (LineID lineID : stripBreakpointComments()) {
88-
debugger.setBreakpoint(lineID);
89-
}
90-
91-
super.debugger = debugger;
85+
initDebugger();
9286

9387
androidTools = loadAndroidTools();
9488
addToolsToMenu();
@@ -597,8 +591,13 @@ private List<AndroidTool> loadAndroidTools() {
597591
ArrayList<AndroidTool> outgoing = new ArrayList<AndroidTool>();
598592
File toolPath = new File(androidMode.getFolder(), "tools/SDKUpdater");
599593
AndroidTool tool = null;
594+
595+
// List<Mode> modes = base.getModeList();
596+
// Mode defMode = modes.get(0);
597+
600598
try {
601-
tool = new AndroidTool(toolPath, androidMode.getSDK());
599+
600+
tool = new AndroidTool(toolPath, androidMode);
602601
tool.init(base);
603602
outgoing.add(tool);
604603
} catch (Throwable e) {
@@ -612,7 +611,8 @@ private void addToolsToMenu() {
612611
JMenuItem item;
613612

614613
for (final Tool tool : androidTools) {
615-
item = new JMenuItem(AndroidMode.getTextString(tool.getMenuTitle()));
614+
// item = new JMenuItem(AndroidMode.getTextString(tool.getMenuTitle()));
615+
item = new JMenuItem(tool.getMenuTitle());
616616
item.addActionListener(new ActionListener() {
617617
public void actionPerformed(ActionEvent e) {
618618
tool.run();
@@ -642,6 +642,15 @@ public void actionPerformed(ActionEvent e) {
642642
androidMenu.add(item);
643643
}
644644

645+
private void initDebugger() {
646+
debugger = new AndroidDebugger(this, androidMode);
647+
// Set saved breakpoints when sketch is opened for the first time
648+
for (LineID lineID : stripBreakpointComments()) {
649+
debugger.setBreakpoint(lineID);
650+
}
651+
super.debugger = debugger;
652+
653+
}
645654

646655
class UpdateDeviceListTask extends TimerTask {
647656

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

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,12 @@ public AndroidSDK getSDK() {
189189
return sdk;
190190
}
191191

192+
193+
public String getModeJar() {
194+
String modePath = new File(getFolder(), "mode").getAbsolutePath();
195+
return modePath + File.separator + "AndroidMode.jar";
196+
}
197+
192198

193199
@Override
194200
public String getSearchPath() {
@@ -397,7 +403,12 @@ private void loadTextStrings() {
397403
}
398404

399405
static public String getTextString(String key) {
400-
return textStrings.get(key);
406+
if (textStrings.containsKey(key)) {
407+
return textStrings.get(key);
408+
} else {
409+
return key;
410+
}
411+
401412
// return Language.text(key);
402413
}
403414

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

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/*
44
Part of the Processing project - http://processing.org
55
6-
Copyright (c) 2017 The Processing Foundation
6+
Copyright (c) 2017-21 The Processing Foundation
77
88
This program is free software; you can redistribute it and/or modify
99
it under the terms of the GNU General Public License version 2
@@ -27,6 +27,7 @@
2727

2828
import processing.app.Base;
2929
import processing.app.Messages;
30+
import processing.app.Mode;
3031
import processing.app.Util;
3132
import processing.app.contrib.ContributionType;
3233
import processing.app.contrib.IgnorableException;
@@ -37,13 +38,13 @@
3738
* Specialized local contribution for Android tools. Cannot use ToolContribution
3839
* from processing-app since Android tools may need SDK jars in the classpath.
3940
*/
40-
public class AndroidTool extends LocalContribution implements Tool, Comparable<AndroidTool> {
41-
private AndroidSDK sdk;
41+
public class AndroidTool extends LocalContribution implements Tool, Comparable<AndroidTool> {
4242
private Tool tool;
43+
private AndroidMode mode;
4344

44-
AndroidTool(File toolFolder, AndroidSDK sdk) throws Throwable {
45+
AndroidTool(File toolFolder, AndroidMode androidMode) throws Throwable {
4546
super(toolFolder);
46-
this.sdk = sdk;
47+
this.mode = androidMode;
4748

4849
String className = initLoader(null);
4950
if (className != null) {
@@ -86,18 +87,16 @@ public String initLoader(String className) throws Exception {
8687
" class inside " + mainJar.getAbsolutePath());
8788
}
8889
}
89-
90-
// Add .jar and .zip files from the "tool" and the SDK/tools/lib
90+
91+
// Add .jar and .zip files from the "tool" and the tools/lib
9192
// folder into the classpath
92-
// File d = sdk.getToolsFolder();
9393
File libDir = new File(folder, "lib");
94-
// File libDir = new File(d, "lib");
9594
File[] toolArchives = Util.listJarFiles(toolDir);
9695
File[] libArchives = Util.listJarFiles(libDir);
9796

9897
if (toolArchives != null && toolArchives.length > 0 &&
9998
libArchives != null && libArchives.length > 0) {
100-
URL[] urlList = new URL[toolArchives.length + libArchives.length];
99+
URL[] urlList = new URL[toolArchives.length + libArchives.length + 1];
101100

102101
int j;
103102
for (j = 0; j < toolArchives.length; j++) {
@@ -108,6 +107,11 @@ public String initLoader(String className) throws Exception {
108107
Messages.log("Found archive " + libArchives[k] + " for " + getName());
109108
urlList[j] = libArchives[k].toURI().toURL();
110109
}
110+
urlList[urlList.length - 1] = new File(mode.getModeJar()).toURI().toURL();
111+
112+
113+
// String modePath = new File(dmode.getFolder(), "mode").getAbsolutePath();
114+
// urlList[urlList.length - 1] = new File(modePath + File.separator + "JavaMode.jar").toURI().toURL();
111115

112116
loader = new URLClassLoader(urlList);
113117
Messages.log("loading above JARs with loader " + loader);

‎mode/tools/SDKUpdater/build.gradle‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ configurations {
66
}
77

88
dependencies {
9-
implementation group: "org.processing", name: "pde", version: "${processingVersion}"
10-
9+
// implementation group: "org.processing", name: "pde", version: "${processingVersion}"
1110
implementation group: "org.processing", name: "java-mode", version: "${processingVersion}"
1211
implementation fileTree(include: ["AndroidMode.jar"], dir: '../../mode')
1312

‎mode/tools/SDKUpdater/src/processing/mode/android/tools/SDKUpdater.java‎

Lines changed: 35 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import processing.app.Preferences;
3636
import processing.app.tools.Tool;
3737
import processing.app.ui.Toolkit;
38-
import processing.mode.android.AndroidMode;
3938

4039
import javax.swing.*;
4140
import javax.swing.border.EmptyBorder;
@@ -69,10 +68,13 @@ public class SDKUpdater extends JFrame implements PropertyChangeListener, Tool {
6968
final static private int BUTTON_WIDTH = Toolkit.zoom(75);
7069
final static private int BUTTON_HEIGHT = Toolkit.zoom(25);
7170

71+
// private final Vector<String> columns = new Vector<>(Arrays.asList(
72+
// AndroidMode.getTextString("sdk_updater.name_column"),
73+
// AndroidMode.getTextString("sdk_updater.version_column"),
74+
// AndroidMode.getTextString("sdk_updater.available_column")));
7275
private final Vector<String> columns = new Vector<>(Arrays.asList(
73-
AndroidMode.getTextString("sdk_updater.name_column"),
74-
AndroidMode.getTextString("sdk_updater.version_column"),
75-
AndroidMode.getTextString("sdk_updater.available_column")));
76+
"Package name", "Installed version", "Available update" ));
77+
7678
private static final String PROPERTY_CHANGE_QUERY = "query";
7779

7880
private File sdkFolder;
@@ -105,13 +107,15 @@ public void run() {
105107
queryTask = new QueryTask();
106108
queryTask.addPropertyChangeListener(this);
107109
queryTask.execute();
108-
status.setText(AndroidMode.getTextString("sdk_updater.query_message"));
110+
// status.setText(AndroidMode.getTextString("sdk_updater.query_message"));
111+
status.setText("Querying packages...");
109112
}
110113

111114

112115
@Override
113116
public String getMenuTitle() {
114-
return AndroidMode.getTextString("menu.android.sdk_updater");
117+
// return AndroidMode.getTextString("menu.android.sdk_updater");
118+
return "SDK Updater";
115119
}
116120

117121

@@ -122,13 +126,16 @@ public void propertyChange(PropertyChangeEvent evt) {
122126
progressBar.setIndeterminate(false);
123127
if (numUpdates == 0) {
124128
actionButton.setEnabled(false);
125-
status.setText(AndroidMode.getTextString("sdk_updater.no_updates_message"));
129+
// status.setText(AndroidMode.getTextString("sdk_updater.no_updates_message"));
130+
status.setText("No updates available");
126131
} else {
127132
actionButton.setEnabled(true);
128133
if (numUpdates == 1) {
129-
status.setText(AndroidMode.getTextString("sdk_updater.one_updates_message"));
134+
// status.setText(AndroidMode.getTextString("sdk_updater.one_updates_message"));
135+
status.setText("1 update found!");
130136
} else {
131-
status.setText(AndroidMode.getTextString("sdk_updater.many_updates_message", numUpdates));
137+
// status.setText(AndroidMode.getTextString("sdk_updater.many_updates_message", numUpdates));
138+
status.setText(numUpdates + " updates found!");
132139
}
133140
}
134141
break;
@@ -280,7 +287,8 @@ protected Object doInBackground() throws Exception {
280287
for (String path : settings.getPaths(mRepoManager)) {
281288
RemotePackage p = mRepoManager.getPackages().getRemotePackages().get(path);
282289
if (p == null) {
283-
progress.logWarning(AndroidMode.getTextString("sdk_updater.warning_failed_finding_package", path));
290+
// progress.logWarning(AndroidMode.getTextString("sdk_updater.warning_failed_finding_package", path));
291+
progress.logWarning("Failed to find package " + path);
284292
throw new SdkManagerCli.CommandFailedException();
285293
}
286294
remotes.add(p);
@@ -297,7 +305,8 @@ protected Object doInBackground() throws Exception {
297305
}
298306
}
299307
} else {
300-
progress.logWarning(AndroidMode.getTextString("sdk_updater.warning_failed_computing_dependency_list"));
308+
// progress.logWarning(AndroidMode.getTextString("sdk_updater.warning_failed_computing_dependency_list"));
309+
progress.logWarning("Unable to compute a complete list of dependencies.");
301310
throw new SdkManagerCli.CommandFailedException();
302311
}
303312

@@ -311,7 +320,8 @@ protected void done() {
311320
try {
312321
get();
313322
actionButton.setEnabled(false);
314-
status.setText(AndroidMode.getTextString("sdk_updater.refresh_package_message"));
323+
// status.setText(AndroidMode.getTextString("sdk_updater.refresh_package_message"));
324+
status.setText("Refreshing packages...");
315325
queryTask = new QueryTask();
316326
queryTask.addPropertyChangeListener(SDKUpdater.this);
317327
queryTask.execute();
@@ -460,8 +470,10 @@ public void actionPerformed(ActionEvent e) {
460470
// };
461471
// update.start();
462472

463-
status.setText(AndroidMode.getTextString("sdk_updater.download_package_message"));
464-
actionButton.setText(AndroidMode.getTextString("sdk_updater.cancel_button_label"));
473+
// status.setText(AndroidMode.getTextString("sdk_updater.download_package_message"));
474+
status.setText("Downloading available updates...");
475+
// actionButton.setText(AndroidMode.getTextString("sdk_updater.cancel_button_label"));
476+
actionButton.setText("Cancel");
465477
}
466478
}
467479
});
@@ -484,7 +496,8 @@ public void actionPerformed(ActionEvent actionEvent) {
484496
}
485497
};
486498

487-
JButton closeButton = new JButton(AndroidMode.getTextString("sdk_updater.close_button_label"));
499+
// JButton closeButton = new JButton(AndroidMode.getTextString("sdk_updater.close_button_label"));
500+
JButton closeButton = new JButton("Close");
488501
closeButton.setPreferredSize(new Dimension(BUTTON_WIDTH, BUTTON_HEIGHT));
489502
closeButton.addActionListener(disposer);
490503
closeButton.setEnabled(true);
@@ -523,10 +536,14 @@ public void cancelTasks() {
523536
queryTask.cancel(true);
524537
if (downloadTaskRunning) {
525538
downloadTask.cancel(true);
526-
status.setText(AndroidMode.getTextString("sdk_updater.download_canceled_message"));
539+
// status.setText(AndroidMode.getTextString("sdk_updater.download_canceled_message"));
540+
status.setText("Download canceled");
527541
JOptionPane.showMessageDialog(null,
528-
AndroidMode.getTextString("sdk_updater.download_canceled_message"), "Warning", JOptionPane.WARNING_MESSAGE);
529-
actionButton.setText(AndroidMode.getTextString("sdk_updater.update_button_label"));
542+
// AndroidMode.getTextString("sdk_updater.download_canceled_message"),
543+
"Download canceled",
544+
"Warning", JOptionPane.WARNING_MESSAGE);
545+
// actionButton.setText(AndroidMode.getTextString("sdk_updater.update_button_label"));
546+
actionButton.setText("Update");
530547
}
531548
}
532549

0 commit comments

Comments
 (0)