Skip to content

Commit aaeba7c

Browse files
codeanticodecodeanticode
committed
some formatting
1 parent 64cf1bc commit aaeba7c

File tree

6 files changed

+41
-41
lines changed

6 files changed

+41
-41
lines changed

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -277,10 +277,10 @@ public File exportProject() throws IOException, SketchException {
277277

278278
public File exportPackage(String keyStorePassword) throws Exception {
279279
File projectFolder = build("release");
280-
if(projectFolder == null) return null;
280+
if (projectFolder == null) return null;
281281

282282
File signedPackage = signPackage(projectFolder, keyStorePassword);
283-
if(signedPackage == null) return null;
283+
if (signedPackage == null) return null;
284284

285285
File exportFolder = createExportFolder();
286286
Base.copyDir(projectFolder, exportFolder);
@@ -289,26 +289,26 @@ public File exportPackage(String keyStorePassword) throws Exception {
289289

290290
private File signPackage(File projectFolder, String keyStorePassword) throws Exception {
291291
File keyStore = AndroidKeyStore.getKeyStore();
292-
if(keyStore == null) return null;
292+
if (keyStore == null) return null;
293293

294294
File unsignedPackage = new File(projectFolder, "bin/" + sketch.getName() + "-release-unsigned.apk");
295-
if(!unsignedPackage.exists()) return null;
295+
if (!unsignedPackage.exists()) return null;
296296

297297
JarSigner.signJar(unsignedPackage, AndroidKeyStore.ALIAS_STRING, keyStorePassword, keyStore.getAbsolutePath(), keyStorePassword);
298298

299-
//if(verifySignedPackage(unsignedPackage)) {
299+
//if (verifySignedPackage(unsignedPackage)) {
300300
File signedPackage = new File(projectFolder, "bin/" + sketch.getName() + "-release-signed.apk");
301-
if(signedPackage.exists()) {
301+
if (signedPackage.exists()) {
302302
boolean deleteResult = signedPackage.delete();
303-
if(!deleteResult) {
303+
if (!deleteResult) {
304304
Base.showWarning("Error during package signing",
305305
"Unable to delete old signed package");
306306
return null;
307307
}
308308
}
309309

310310
boolean renameResult = unsignedPackage.renameTo(signedPackage);
311-
if(!renameResult) {
311+
if (!renameResult) {
312312
Base.showWarning("Error during package signing",
313313
"Unable to rename package file");
314314
return null;
@@ -361,7 +361,7 @@ private File zipalignPackage(File signedPackage, File projectFolder) throws IOEx
361361
Process alignProcess = Runtime.getRuntime().exec(args);
362362
alignProcess.waitFor();
363363

364-
if(alignedPackage.exists()) return alignedPackage;
364+
if (alignedPackage.exists()) return alignedPackage;
365365
return null;
366366
}
367367

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -53,33 +53,33 @@ public void run() {
5353
final Devices devices = Devices.getInstance();
5454
java.util.List<Device> deviceList = devices.findMultiple(false);
5555
Device selectedDevice = devices.getSelectedDevice();
56-
57-
if(deviceList.size() == 0) {
58-
if(deviceMenu.getItem(0).isEnabled()) {
56+
57+
if (deviceList.size() == 0) {
58+
//if (deviceMenu.getItem(0).isEnabled()) {
59+
if (0 < deviceMenu.getItemCount()) {
5960
deviceMenu.removeAll();
6061
JMenuItem noDevicesItem = new JMenuItem("No connected devices");
6162
noDevicesItem.setEnabled(false);
6263
deviceMenu.add(noDevicesItem);
6364
}
64-
6565
devices.setSelectedDevice(null);
6666
} else {
6767
deviceMenu.removeAll();
6868

69-
if(selectedDevice == null) {
69+
if (selectedDevice == null) {
7070
selectedDevice = deviceList.get(0);
7171
devices.setSelectedDevice(selectedDevice);
7272
} else {
7373
// check if selected device is still connected
7474
boolean found = false;
7575
for (Device device : deviceList) {
76-
if(device.equals(selectedDevice)) {
76+
if (device.equals(selectedDevice)) {
7777
found = true;
7878
break;
7979
}
8080
}
8181

82-
if(!found) {
82+
if (!found) {
8383
selectedDevice = deviceList.get(0);
8484
devices.setSelectedDevice(selectedDevice);
8585
}
@@ -89,13 +89,13 @@ public void run() {
8989
final JCheckBoxMenuItem deviceItem = new JCheckBoxMenuItem(device.getName());
9090
deviceItem.setEnabled(true);
9191

92-
if(device.equals(selectedDevice)) deviceItem.setState(true);
92+
if (device.equals(selectedDevice)) deviceItem.setState(true);
9393

9494
// prevent checkboxmenuitem automatic state changing onclick
9595
deviceItem.addChangeListener(new ChangeListener() {
9696
@Override
9797
public void stateChanged(ChangeEvent e) {
98-
if(device.equals(devices.getSelectedDevice())) deviceItem.setState(true);
98+
if (device.equals(devices.getSelectedDevice())) deviceItem.setState(true);
9999
else deviceItem.setState(false);
100100
}
101101
});
@@ -105,7 +105,7 @@ public void stateChanged(ChangeEvent e) {
105105
public void actionPerformed(ActionEvent e) {
106106
devices.setSelectedDevice(device);
107107

108-
for(int i = 0; i < deviceMenu.getItemCount(); i++) {
108+
for (int i = 0; i < deviceMenu.getItemCount(); i++) {
109109
((JCheckBoxMenuItem) deviceMenu.getItem(i)).setState(false);
110110
}
111111

@@ -470,7 +470,7 @@ public void run() {
470470
public void handleExportPackage() {
471471
// Need to implement an entire signing setup first
472472
// http://dev.processing.org/bugs/show_bug.cgi?id=1430
473-
if(handleExportCheckModified()) {
473+
if (handleExportCheckModified()) {
474474
deactivateExport();
475475
new KeyStoreManager(this);
476476
}
@@ -484,7 +484,7 @@ public void run() {
484484
AndroidBuild build = new AndroidBuild(sketch, androidMode);
485485
try {
486486
File projectFolder = build.exportPackage(keyStorePassword);
487-
if(projectFolder != null) {
487+
if (projectFolder != null) {
488488
statusNotice("Done with export.");
489489
Base.openFolder(projectFolder);
490490
} else {

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@ public class AndroidKeyStore {
1717

1818
public static File getKeyStore() {
1919
File keyStore = getKeyStoreLocation();
20-
if(!keyStore.exists()) return null;
20+
if (!keyStore.exists()) return null;
2121
return keyStore;
2222
}
2323

2424
public static File getKeyStoreLocation() {
2525
File sketchbookFolder = processing.app.Base.getSketchbookFolder();
2626
File keyStoreFolder = new File(sketchbookFolder, "keystore");
27-
if(!keyStoreFolder.exists()) {
27+
if (!keyStoreFolder.exists()) {
2828
boolean result = keyStoreFolder.mkdirs();
2929

30-
if(!result) {
30+
if (!result) {
3131
Base.showWarning("Folders, folders, folders",
3232
"Could not create the necessary folders to build.\n" +
3333
"Perhaps you have some file permissions to sort out?", null);
@@ -65,20 +65,20 @@ public static void generateKeyStore(String password,
6565
Process generation = Runtime.getRuntime().exec(args);
6666
generation.waitFor();
6767

68-
if(getKeyStore() == null) throw new Exception();
68+
if (getKeyStore() == null) throw new Exception();
6969
}
7070

7171
public static boolean resetKeyStore() {
7272
File keyStore = getKeyStore();
73-
if(keyStore == null) return true;
73+
if (keyStore == null) return true;
7474

7575
File keyStoreBackup = new File(processing.app.Base.getSketchbookFolder(), "keystore/" + KEYSTORE_FILE_NAME + "-" + AndroidMode.getDateStamp());
76-
if(!keyStore.renameTo(keyStoreBackup)) return false;
76+
if (!keyStore.renameTo(keyStoreBackup)) return false;
7777
return true;
7878
}
7979

8080
private static String parseDnameField(String content) {
81-
if(content == null || content.length() == 0) return "Unknown";
81+
if (content == null || content.length() == 0) return "Unknown";
8282
else return content;
8383
}
8484
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,12 @@ public String getName() {
4848

4949
try {
5050
ProcessResult result = AndroidSDK.runADB("-s", id, "shell", "getprop", "ro.product.brand");
51-
if(result.succeeded()) {
51+
if (result.succeeded()) {
5252
name += result.getStdout() + " ";
5353
}
5454

5555
result = AndroidSDK.runADB("-s", id, "shell", "getprop", "ro.product.model");
56-
if(result.succeeded()) {
56+
if (result.succeeded()) {
5757
name += result.getStdout();
5858
}
5959
} catch (InterruptedException e) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ public List<Device> findMultiple(final boolean wantEmulator) {
178178
*/
179179
public Future<Device> getHardware() {
180180
Device device = getSelectedDevice();
181-
if(device == null || !device.isAlive()) device = blockingGetHardware();
181+
if (device == null || !device.isAlive()) device = blockingGetHardware();
182182
return getHardware(device);
183183
}
184184

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ private void createLayout() {
5151
outer.add(pain);
5252

5353
keyStore = AndroidKeyStore.getKeyStore();
54-
if(keyStore != null) {
54+
if (keyStore != null) {
5555
showKeystorePasswordLayout(pain);
5656
} else {
5757
showKeystoreCredentialsLayout(pain);
@@ -66,8 +66,8 @@ private void createLayout() {
6666
okButton.setPreferredSize(dim);
6767
okButton.addActionListener(new ActionListener() {
6868
public void actionPerformed(ActionEvent e) {
69-
if(checkRequiredFields()) {
70-
if(keyStore == null) {
69+
if (checkRequiredFields()) {
70+
if (keyStore == null) {
7171
try {
7272
AndroidKeyStore.generateKeyStore(new String(passwordField.getPassword()),
7373
commonName.getText(), organizationalUnit.getText(), organizationName.getText(),
@@ -108,10 +108,10 @@ public void actionPerformed(ActionEvent e) {
108108
"which means you won't be able to upload an update for your app signed with the new keystore to Google Play.<br/><br/>" +
109109
"We will make a backup for the old keystore.</body></html>");
110110

111-
if(result == JOptionPane.NO_OPTION) {
111+
if (result == JOptionPane.NO_OPTION) {
112112
setVisible(true);
113113
} else {
114-
if(!AndroidKeyStore.resetKeyStore()) {
114+
if (!AndroidKeyStore.resetKeyStore()) {
115115
Base.showWarning("Android keystore", "Failed to remove keystore");
116116
setVisible(true);
117117
} else {
@@ -127,13 +127,13 @@ public void actionPerformed(ActionEvent e) {
127127
if (Base.isMacOS()) {
128128
buttons.add(cancelButton);
129129

130-
if(keyStore != null) buttons.add(resetKeystoreButton);
130+
if (keyStore != null) buttons.add(resetKeystoreButton);
131131
// buttons.add(Box.createHorizontalStrut(8));
132132
buttons.add(okButton);
133133
} else {
134134
buttons.add(okButton);
135135

136-
if(keyStore != null) buttons.add(resetKeystoreButton);
136+
if (keyStore != null) buttons.add(resetKeystoreButton);
137137
// buttons.add(Box.createHorizontalStrut(8));
138138
buttons.add(cancelButton);
139139
}
@@ -174,10 +174,10 @@ private void showKeystorePasswordLayout(Box pain) {
174174
}
175175

176176
private boolean checkRequiredFields() {
177-
if(passwordField.getPassword().length > 5) {
178-
if(keyStore != null) return true;
177+
if (passwordField.getPassword().length > 5) {
178+
if (keyStore != null) return true;
179179

180-
if(Arrays.equals(passwordField.getPassword(), repeatPasswordField.getPassword())) {
180+
if (Arrays.equals(passwordField.getPassword(), repeatPasswordField.getPassword())) {
181181
return true;
182182
} else {
183183
Base.showWarning("Passwords", "Keystore passwords do not match");

0 commit comments

Comments
 (0)