aboutsummaryrefslogtreecommitdiffstats
path: root/app/src/main/java/org/connectbot/service
diff options
context:
space:
mode:
authorKenny Root <kenny@the-b.org>2015-03-23 22:10:54 +0000
committerKenny Root <kenny@the-b.org>2015-03-23 22:35:24 +0000
commitbf3fb8149334b708d2bfccad6b95833ff719cd07 (patch)
tree29e2964e7376615e32eeedfb4cc7d134baa3d3cc /app/src/main/java/org/connectbot/service
parent599926fc4af27a2bb6951ef5413cb6e2ae5d6ed7 (diff)
downloadconnectbot-bf3fb8149334b708d2bfccad6b95833ff719cd07.tar.gz
connectbot-bf3fb8149334b708d2bfccad6b95833ff719cd07.tar.bz2
connectbot-bf3fb8149334b708d2bfccad6b95833ff719cd07.zip
Add some whitespace rules and fixes for them
Diffstat (limited to 'app/src/main/java/org/connectbot/service')
-rw-r--r--app/src/main/java/org/connectbot/service/ConnectionNotifier.java2
-rw-r--r--app/src/main/java/org/connectbot/service/PromptHelper.java8
-rw-r--r--app/src/main/java/org/connectbot/service/TerminalBridge.java26
-rw-r--r--app/src/main/java/org/connectbot/service/TerminalKeyListener.java18
-rw-r--r--app/src/main/java/org/connectbot/service/TerminalManager.java10
5 files changed, 32 insertions, 32 deletions
diff --git a/app/src/main/java/org/connectbot/service/ConnectionNotifier.java b/app/src/main/java/org/connectbot/service/ConnectionNotifier.java
index aedbd61..e42525d 100644
--- a/app/src/main/java/org/connectbot/service/ConnectionNotifier.java
+++ b/app/src/main/java/org/connectbot/service/ConnectionNotifier.java
@@ -53,7 +53,7 @@ public abstract class ConnectionNotifier {
}
protected NotificationManager getNotificationManager(Context context) {
- return (NotificationManager)context.getSystemService(Context.NOTIFICATION_SERVICE);
+ return (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
}
protected Notification newNotification(Context context) {
diff --git a/app/src/main/java/org/connectbot/service/PromptHelper.java b/app/src/main/java/org/connectbot/service/PromptHelper.java
index f0a37be..9c34f1a 100644
--- a/app/src/main/java/org/connectbot/service/PromptHelper.java
+++ b/app/src/main/java/org/connectbot/service/PromptHelper.java
@@ -122,8 +122,8 @@ public class PromptHelper {
public String requestStringPrompt(String instructions, String hint) {
String value = null;
try {
- value = (String)this.requestPrompt(instructions, hint, String.class);
- } catch(Exception e) {
+ value = (String) requestPrompt(instructions, hint, String.class);
+ } catch (Exception e) {
}
return value;
}
@@ -137,8 +137,8 @@ public class PromptHelper {
public Boolean requestBooleanPrompt(String instructions, String hint) {
Boolean value = null;
try {
- value = (Boolean)this.requestPrompt(instructions, hint, Boolean.class);
- } catch(Exception e) {
+ value = (Boolean) requestPrompt(instructions, hint, Boolean.class);
+ } catch (Exception e) {
}
return value;
}
diff --git a/app/src/main/java/org/connectbot/service/TerminalBridge.java b/app/src/main/java/org/connectbot/service/TerminalBridge.java
index 6b87b74..ea19e34 100644
--- a/app/src/main/java/org/connectbot/service/TerminalBridge.java
+++ b/app/src/main/java/org/connectbot/service/TerminalBridge.java
@@ -288,7 +288,7 @@ public class TerminalBridge implements VDUDisplay {
*/
public String[] replyToChallenge(String name, String instruction, int numPrompts, String[] prompt, boolean[] echo) {
String[] responses = new String[numPrompts];
- for(int i = 0; i < numPrompts; i++) {
+ for (int i = 0; i < numPrompts; i++) {
// request response from user for each prompt
responses[i] = promptHelper.requestStringPrompt(instruction, prompt[i]);
}
@@ -490,15 +490,15 @@ public class TerminalBridge implements VDUDisplay {
// read new metrics to get exact pixel dimensions
FontMetrics fm = defaultPaint.getFontMetrics();
- charTop = (int)Math.ceil(fm.top);
+ charTop = (int) Math.ceil(fm.top);
float[] widths = new float[1];
defaultPaint.getTextWidths("X", widths);
- charWidth = (int)Math.ceil(widths[0]);
- charHeight = (int)Math.ceil(fm.descent - fm.top);
+ charWidth = (int) Math.ceil(widths[0]);
+ charHeight = (int) Math.ceil(fm.descent - fm.top);
// refresh any bitmap with new font size
- if(parent != null)
+ if (parent != null)
parentChanged(parent);
for (FontSizeChangedListener ofscl : fontSizeChangedListeners)
@@ -571,7 +571,7 @@ public class TerminalBridge implements VDUDisplay {
// reallocate new bitmap if needed
boolean newBitmap = (bitmap == null);
- if(bitmap != null)
+ if (bitmap != null)
newBitmap = (bitmap.getWidth() != width || bitmap.getHeight() != height);
if (newBitmap) {
@@ -603,9 +603,9 @@ public class TerminalBridge implements VDUDisplay {
buffer.setScreenSize(columns, rows, true);
}
- if(transport != null)
+ if (transport != null)
transport.setDimensions(columns, rows, width, height);
- } catch(Exception e) {
+ } catch (Exception e) {
Log.e(TAG, "Problem while trying to resize screen or PTY", e);
}
@@ -664,7 +664,7 @@ public class TerminalBridge implements VDUDisplay {
boolean isWideCharacter = false;
// walk through all lines in the buffer
- for(int l = 0; l < buffer.height; l++) {
+ for (int l = 0; l < buffer.height; l++) {
// check if this line is dirty and needs to be repainted
// also check for entire-buffer dirty flags
@@ -713,7 +713,7 @@ public class TerminalBridge implements VDUDisplay {
addr++;
else {
// determine the amount of continuous characters with the same settings and print them all at once
- while(c + addr < buffer.width
+ while (c + addr < buffer.width
&& buffer.charAttributes[buffer.windowBase + l][c + addr] == currAttr) {
addr++;
}
@@ -739,7 +739,7 @@ public class TerminalBridge implements VDUDisplay {
// write the text string starting at 'c' for 'addr' number of characters
defaultPaint.setColor(fg);
- if((currAttr & VDUBuffer.INVISIBLE) == 0)
+ if ((currAttr & VDUBuffer.INVISIBLE) == 0)
canvas.drawText(buffer.charArray[buffer.windowBase + l], c,
addr, c * charWidth, (l * charHeight) - charTop,
defaultPaint);
@@ -820,8 +820,8 @@ public class TerminalBridge implements VDUDisplay {
float[] widths = new float[1];
defaultPaint.getTextWidths("X", widths);
- int termWidth = (int)widths[0] * cols;
- int termHeight = (int)Math.ceil(fm.descent - fm.top) * rows;
+ int termWidth = (int) widths[0] * cols;
+ int termHeight = (int) Math.ceil(fm.descent - fm.top) * rows;
Log.d("fontsize", String.format("font size %f resulted in %d x %d", size, termWidth, termHeight));
diff --git a/app/src/main/java/org/connectbot/service/TerminalKeyListener.java b/app/src/main/java/org/connectbot/service/TerminalKeyListener.java
index 4764261..2a911a8 100644
--- a/app/src/main/java/org/connectbot/service/TerminalKeyListener.java
+++ b/app/src/main/java/org/connectbot/service/TerminalKeyListener.java
@@ -182,7 +182,7 @@ public class TerminalKeyListener implements OnKeyListener, OnSharedPreferenceCha
if (keyCode == KeyEvent.KEYCODE_VOLUME_UP) {
bridge.increaseFontSize();
return true;
- } else if(keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) {
+ } else if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) {
bridge.decreaseFontSize();
return true;
}
@@ -355,15 +355,15 @@ public class TerminalKeyListener implements OnKeyListener, OnSharedPreferenceCha
String camera = manager.prefs.getString(
PreferenceConstants.CAMERA,
PreferenceConstants.CAMERA_CTRLA_SPACE);
- if(PreferenceConstants.CAMERA_CTRLA_SPACE.equals(camera)) {
+ if (PreferenceConstants.CAMERA_CTRLA_SPACE.equals(camera)) {
bridge.transport.write(0x01);
bridge.transport.write(' ');
- } else if(PreferenceConstants.CAMERA_CTRLA.equals(camera)) {
+ } else if (PreferenceConstants.CAMERA_CTRLA.equals(camera)) {
bridge.transport.write(0x01);
- } else if(PreferenceConstants.CAMERA_ESC.equals(camera)) {
- ((vt320)buffer).keyTyped(vt320.KEY_ESCAPE, ' ', 0);
- } else if(PreferenceConstants.CAMERA_ESC_A.equals(camera)) {
- ((vt320)buffer).keyTyped(vt320.KEY_ESCAPE, ' ', 0);
+ } else if (PreferenceConstants.CAMERA_ESC.equals(camera)) {
+ ((vt320) buffer).keyTyped(vt320.KEY_ESCAPE, ' ', 0);
+ } else if (PreferenceConstants.CAMERA_ESC_A.equals(camera)) {
+ ((vt320) buffer).keyTyped(vt320.KEY_ESCAPE, ' ', 0);
bridge.transport.write('a');
}
@@ -374,7 +374,7 @@ public class TerminalKeyListener implements OnKeyListener, OnSharedPreferenceCha
getStateForBuffer());
return true;
case KeyEvent.KEYCODE_ENTER:
- ((vt320)buffer).keyTyped(vt320.KEY_ENTER, ' ', 0);
+ ((vt320) buffer).keyTyped(vt320.KEY_ENTER, ' ', 0);
return true;
case KeyEvent.KEYCODE_DPAD_LEFT:
@@ -480,7 +480,7 @@ public class TerminalKeyListener implements OnKeyListener, OnSharedPreferenceCha
}
public void sendEscape() {
- ((vt320)buffer).keyTyped(vt320.KEY_ESCAPE, ' ', 0);
+ ((vt320) buffer).keyTyped(vt320.KEY_ESCAPE, ' ', 0);
}
/**
diff --git a/app/src/main/java/org/connectbot/service/TerminalManager.java b/app/src/main/java/org/connectbot/service/TerminalManager.java
index 369d79a..928c5f5 100644
--- a/app/src/main/java/org/connectbot/service/TerminalManager.java
+++ b/app/src/main/java/org/connectbot/service/TerminalManager.java
@@ -172,12 +172,12 @@ public class TerminalManager extends Service implements BridgeDisconnectedListen
disconnectAll(true);
- if(hostdb != null) {
+ if (hostdb != null) {
hostdb.close();
hostdb = null;
}
- if(pubkeydb != null) {
+ if (pubkeydb != null) {
pubkeydb.close();
pubkeydb = null;
}
@@ -261,7 +261,7 @@ public class TerminalManager extends Service implements BridgeDisconnectedListen
int scrollback = 140;
try {
scrollback = Integer.parseInt(prefs.getString(PreferenceConstants.SCROLLBACK, "140"));
- } catch(Exception e) {
+ } catch (Exception e) {
}
return scrollback;
}
@@ -400,7 +400,7 @@ public class TerminalManager extends Service implements BridgeDisconnectedListen
public boolean removeKey(byte[] publicKey) {
String nickname = null;
- for (Entry<String,KeyHolder> entry : loadedKeypairs.entrySet()) {
+ for (Entry<String, KeyHolder> entry : loadedKeypairs.entrySet()) {
if (Arrays.equals(entry.getValue().openSSHPubkey, publicKey)) {
nickname = entry.getKey();
break;
@@ -431,7 +431,7 @@ public class TerminalManager extends Service implements BridgeDisconnectedListen
}
public String getKeyNickname(byte[] publicKey) {
- for (Entry<String,KeyHolder> entry : loadedKeypairs.entrySet()) {
+ for (Entry<String, KeyHolder> entry : loadedKeypairs.entrySet()) {
if (Arrays.equals(entry.getValue().openSSHPubkey, publicKey))
return entry.getKey();
}