Skip to content

Commit 07e0383

Browse files
codeanticodecodeanticode
committed
some formatting
1 parent 8fcc72b commit 07e0383

File tree

5 files changed

+37
-35
lines changed

5 files changed

+37
-35
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public UpdateDeviceListTask(JMenu deviceMenu) {
4949

5050
@Override
5151
public void run() {
52-
if(androidMode.getSDK() == null) return;
52+
if (androidMode.getSDK() == null) return;
5353

5454
final Devices devices = Devices.getInstance();
5555
java.util.List<Device> deviceList = devices.findMultiple(false);
@@ -279,7 +279,7 @@ private void updateSdkMenu(final JMenu sdkMenu) {
279279
try {
280280
ArrayList<AndroidSDK.SDKTarget> targets = androidMode.getSDK().getAvailableSdkTargets();
281281

282-
if(targets.size() != 0) sdkMenu.removeAll();
282+
if (targets.size() != 0) sdkMenu.removeAll();
283283

284284
AndroidSDK.SDKTarget lowestTargetAvailable = null;
285285
JCheckBoxMenuItem lowestTargetMenuItem = null;
@@ -290,12 +290,12 @@ private void updateSdkMenu(final JMenu sdkMenu) {
290290
for(final AndroidSDK.SDKTarget target : targets) {
291291
final JCheckBoxMenuItem item = new JCheckBoxMenuItem("API " + target.name + " (" + target.version + ")");
292292

293-
if(savedTargetSet == false && (lowestTargetAvailable == null || lowestTargetAvailable.version > target.version)) {
293+
if (savedTargetSet == false && (lowestTargetAvailable == null || lowestTargetAvailable.version > target.version)) {
294294
lowestTargetAvailable = target;
295295
lowestTargetMenuItem = item;
296296
}
297297

298-
if(Integer.toString(target.version).equals(savedTargetVersion)) {
298+
if (Integer.toString(target.version).equals(savedTargetVersion)) {
299299
AndroidBuild.setSdkTarget(target, sketch);
300300
item.setState(true);
301301
savedTargetSet = true;
@@ -325,7 +325,7 @@ public void actionPerformed(ActionEvent e) {
325325
sdkMenu.add(item);
326326
}
327327

328-
if(!savedTargetSet) {
328+
if (!savedTargetSet) {
329329
AndroidBuild.setSdkTarget(lowestTargetAvailable, sketch);
330330
lowestTargetMenuItem.setState(true);
331331
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ public void checkSDK(Editor parent) {
141141
}
142142
}
143143
if (sdk == null) {
144-
if(!sdkDownloadInProgress) {
144+
if (!sdkDownloadInProgress) {
145145
Base.showWarning("It's gonna be a bad day",
146146
"The Android SDK could not be loaded.\n" +
147147
"Use of Android mode will be all but disabled.",

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ class AndroidSDK {
4545
"The selected folder does not appear to contain an Android SDK,\n" +
4646
"or the SDK needs to be updated to the latest version.";
4747

48-
private static final String ANDROID_SDK_URL =
49-
"http://developer.android.com/sdk/";
48+
// private static final String ANDROID_SDK_URL =
49+
// "http://developer.android.com/sdk/";
5050

5151

5252
public AndroidSDK(File folder) throws BadSDKException, IOException {
@@ -404,26 +404,26 @@ public ArrayList<SDKTarget> getAvailableSdkTargets() throws IOException {
404404

405405
for(File platform : platforms.listFiles()) {
406406
File propFile = new File(platform, "build.prop");
407-
if(!propFile.exists()) continue;
407+
if (!propFile.exists()) continue;
408408

409409
SDKTarget target = new SDKTarget();
410410

411411
BufferedReader br = new BufferedReader(new FileReader(propFile));
412412
String line;
413413
while ((line = br.readLine()) != null) {
414414
String[] lineData = line.split("=");
415-
if(lineData[0].equals("ro.build.version.sdk")) {
415+
if (lineData[0].equals("ro.build.version.sdk")) {
416416
target.version = Integer.valueOf(lineData[1]);
417417
}
418418

419-
if(lineData[0].equals("ro.build.version.release")) {
419+
if (lineData[0].equals("ro.build.version.release")) {
420420
target.name = lineData[1];
421421
break;
422422
}
423423
}
424424
br.close();
425425

426-
if(target.version != 0 && target.name != null) targets.add(target);
426+
if (target.version != 0 && target.name != null) targets.add(target);
427427
}
428428

429429
return targets;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@ public boolean installApp(final AndroidBuild build, final RunnerListener status)
9595
if (line.startsWith("Failure")) {
9696
errorMsg = line.substring(8);
9797

98-
if(line.contains("INSTALL_PARSE_FAILED_INCONSISTENT_CERTIFICATES")) {
98+
if (line.contains("INSTALL_PARSE_FAILED_INCONSISTENT_CERTIFICATES")) {
9999
boolean removeResult = removeApp(build.getPackageName());
100-
if(removeResult) return installApp(build, status);
100+
if (removeResult) return installApp(build, status);
101101
}
102102

103103
System.err.println(line);

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

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import org.w3c.dom.Node;
66
import org.w3c.dom.NodeList;
77
import org.xml.sax.SAXException;
8+
89
import processing.app.Base;
910
import processing.app.Preferences;
1011

@@ -13,6 +14,7 @@
1314
import javax.xml.parsers.DocumentBuilder;
1415
import javax.xml.parsers.DocumentBuilderFactory;
1516
import javax.xml.parsers.ParserConfigurationException;
17+
1618
import java.awt.*;
1719
import java.awt.event.ActionEvent;
1820
import java.awt.event.ActionListener;
@@ -25,6 +27,7 @@
2527
import java.util.zip.ZipEntry;
2628
import java.util.zip.ZipFile;
2729

30+
@SuppressWarnings("serial")
2831
public class SDKDownloader extends JFrame implements PropertyChangeListener {
2932

3033
private static final String URL_REPOSITORY = "https://dl-ssl.google.com/android/repository/repository-10.xml";
@@ -41,16 +44,17 @@ public class SDKDownloader extends JFrame implements PropertyChangeListener {
4144
JLabel downloadedTextArea;
4245

4346
private int totalSize = 0;
47+
private static ZipFile zip;
4448

4549
class SDKUrlHolder {
4650
public String platformToolsUrl, buildToolsUrl, platformUrl, toolsUrl;
4751
public String platformToolsFilename, buildToolsFilename, platformFilename, toolsFilename;
4852
public int totalSize = 0;
4953
}
5054

51-
class SDKDownloadTask extends SwingWorker {
55+
class SDKDownloadTask extends SwingWorker<Object, Object> {
5256

53-
private int downloadedSize = 0, totalSize = 0;
57+
private int downloadedSize = 0;
5458
private int BUFFER_SIZE = 4096;
5559

5660
@Override
@@ -60,15 +64,15 @@ protected Object doInBackground() throws Exception {
6064

6165
// creating sdk folders
6266
File sdkFolder = new File(modeFolder, "sdk");
63-
if(!sdkFolder.exists()) sdkFolder.mkdir();
67+
if (!sdkFolder.exists()) sdkFolder.mkdir();
6468
File platformsFolder = new File(sdkFolder, "platforms");
65-
if(!platformsFolder.exists()) platformsFolder.mkdir();
69+
if (!platformsFolder.exists()) platformsFolder.mkdir();
6670
File buildToolsFolder = new File(sdkFolder, "build-tools");
67-
if(!buildToolsFolder.exists()) buildToolsFolder.mkdir();
71+
if (!buildToolsFolder.exists()) buildToolsFolder.mkdir();
6872

6973
// creating temp folder for downloaded zip packages
7074
File tempFolder = new File(modeFolder, "temp");
71-
if(!tempFolder.exists()) tempFolder.mkdir();
75+
if (!tempFolder.exists()) tempFolder.mkdir();
7276

7377
try {
7478
SDKUrlHolder downloadUrls = getDownloadUrls(URL_REPOSITORY, hostOs);
@@ -91,7 +95,7 @@ protected Object doInBackground() throws Exception {
9195
File downloadedPlatform = new File(tempFolder, downloadUrls.platformFilename);
9296
downloadAndUnpack(downloadUrls.platformUrl, downloadedPlatform, platformsFolder);
9397

94-
if(Base.isLinux() || Base.isMacOS()) {
98+
if (Base.isLinux() || Base.isMacOS()) {
9599
Runtime.getRuntime().exec("chmod -R 755 " + sdkFolder.getAbsolutePath());
96100
}
97101

@@ -141,9 +145,9 @@ private void downloadAndUnpack(String urlString, File saveTo, File unpackTo) thr
141145
}
142146

143147
private String getOsString() {
144-
if(Base.isWindows()) {
148+
if (Base.isWindows()) {
145149
return "windows";
146-
} else if(Base.isLinux()) {
150+
} else if (Base.isLinux()) {
147151
return "linux";
148152
} else {
149153
return "macosx";
@@ -161,7 +165,7 @@ private SDKUrlHolder getDownloadUrls(String repositoryUrl, String requiredHostOs
161165
NodeList platformList = doc.getElementsByTagName("sdk:platform");
162166
for(int i = 0; i < platformList.getLength(); i++) {
163167
Node platform = platformList.item(i);
164-
if(((Element) platform).getElementsByTagName("sdk:api-level").item(0).getTextContent().equals(PLATFORM_API_LEVEL)) {
168+
if (((Element) platform).getElementsByTagName("sdk:api-level").item(0).getTextContent().equals(PLATFORM_API_LEVEL)) {
165169
Node archiveListItem = ((Element) platform).getElementsByTagName("sdk:archives").item(0);
166170
Node archiveItem = ((Element) archiveListItem).getElementsByTagName("sdk:archive").item(0);
167171
urlHolder.platformUrl = ((Element) archiveItem).getElementsByTagName("sdk:url").item(0).getTextContent();
@@ -177,7 +181,7 @@ private SDKUrlHolder getDownloadUrls(String repositoryUrl, String requiredHostOs
177181
for(int i = 0; i < archiveList.getLength(); i++) {
178182
Node archive = archiveList.item(i);
179183
String hostOs = ((Element) archive).getElementsByTagName("sdk:host-os").item(0).getTextContent();
180-
if(hostOs.equals(requiredHostOs)) {
184+
if (hostOs.equals(requiredHostOs)) {
181185
urlHolder.platformToolsFilename = (((Element) archive).getElementsByTagName("sdk:url").item(0).getTextContent());
182186
urlHolder.platformToolsUrl = URL_REPOSITORY_FOLDER + urlHolder.platformToolsFilename;
183187
urlHolder.totalSize += Integer.parseInt(((Element) archive).getElementsByTagName("sdk:size").item(0).getTextContent());
@@ -192,7 +196,7 @@ private SDKUrlHolder getDownloadUrls(String repositoryUrl, String requiredHostOs
192196
for(int i = 0; i < archiveList.getLength(); i++) {
193197
Node archive = archiveList.item(i);
194198
String hostOs = ((Element) archive).getElementsByTagName("sdk:host-os").item(0).getTextContent();
195-
if(hostOs.equals(requiredHostOs)) {
199+
if (hostOs.equals(requiredHostOs)) {
196200
urlHolder.buildToolsFilename = (((Element) archive).getElementsByTagName("sdk:url").item(0).getTextContent());
197201
urlHolder.buildToolsUrl = URL_REPOSITORY_FOLDER + urlHolder.buildToolsFilename;
198202
urlHolder.totalSize += Integer.parseInt(((Element) archive).getElementsByTagName("sdk:size").item(0).getTextContent());
@@ -207,7 +211,7 @@ private SDKUrlHolder getDownloadUrls(String repositoryUrl, String requiredHostOs
207211
for(int i = 0; i < archiveList.getLength(); i++) {
208212
Node archive = archiveList.item(i);
209213
String hostOs = ((Element) archive).getElementsByTagName("sdk:host-os").item(0).getTextContent();
210-
if(hostOs.equals(requiredHostOs)) {
214+
if (hostOs.equals(requiredHostOs)) {
211215
urlHolder.toolsFilename = (((Element) archive).getElementsByTagName("sdk:url").item(0).getTextContent());
212216
urlHolder.toolsUrl = URL_REPOSITORY_FOLDER + urlHolder.toolsFilename;
213217
urlHolder.totalSize += Integer.parseInt(((Element) archive).getElementsByTagName("sdk:size").item(0).getTextContent());
@@ -221,11 +225,11 @@ private SDKUrlHolder getDownloadUrls(String repositoryUrl, String requiredHostOs
221225

222226
@Override
223227
public void propertyChange(PropertyChangeEvent evt) {
224-
if(evt.getPropertyName().equals(PROPERTY_CHANGE_EVENT_TOTAL)) {
228+
if (evt.getPropertyName().equals(PROPERTY_CHANGE_EVENT_TOTAL)) {
225229
progressBar.setIndeterminate(false);
226230
totalSize = (Integer) evt.getNewValue();
227231
progressBar.setMaximum(totalSize);
228-
} else if(evt.getPropertyName().equals(PROPERTY_CHANGE_EVENT_DOWNLOADED)) {
232+
} else if (evt.getPropertyName().equals(PROPERTY_CHANGE_EVENT_DOWNLOADED)) {
229233
downloadedTextArea.setText(humanReadableByteCount((Integer) evt.getNewValue(), true)
230234
+ " / " + humanReadableByteCount(totalSize, true));
231235
progressBar.setValue((Integer) evt.getNewValue());
@@ -337,12 +341,11 @@ public void actionPerformed(ActionEvent actionEvent) {
337341

338342
static public void extractFolder(File file, File newPath) throws IOException {
339343
int BUFFER = 2048;
340-
ZipFile zip = new ZipFile(file);
341-
Enumeration zipFileEntries = zip.entries();
344+
zip = new ZipFile(file);
345+
Enumeration<? extends ZipEntry> zipFileEntries = zip.entries();
342346

343347
// Process each entry
344-
while (zipFileEntries.hasMoreElements())
345-
{
348+
while (zipFileEntries.hasMoreElements()) {
346349
// grab a zip file entry
347350
ZipEntry entry = (ZipEntry) zipFileEntries.nextElement();
348351
String currentEntry = entry.getName();
@@ -353,8 +356,7 @@ static public void extractFolder(File file, File newPath) throws IOException {
353356
// create the parent directory structure if needed
354357
destinationParent.mkdirs();
355358

356-
if (!entry.isDirectory())
357-
{
359+
if (!entry.isDirectory()) {
358360
BufferedInputStream is = new BufferedInputStream(zip
359361
.getInputStream(entry));
360362
int currentByte;

0 commit comments

Comments
 (0)