dorkbox/SystemTray
2
1
Fork 1
Code Issues Pull Requests Releases 5 Wiki Activity

Fixed issue for possible empty extensions

Browse Source
This commit is contained in:
nathan 2016-12-25 16:56:03 +01:00
parent ec124384e7
commit 389c2a0ed4
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/dorkbox/systemTray/gnomeShell/Extension.java
View File

@ -30,6 +30,7 @@ import java.io.InputStream;
import java.io.PrintStream; import java.io.PrintStream;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Iterator;
import java.util.List; import java.util.List;
import dorkbox.systemTray.SystemTray; import dorkbox.systemTray.SystemTray;
@ -43,6 +44,12 @@ public
class Extension { class Extension {
private static final String UID = "SystemTray@Dorkbox"; private static final String UID = "SystemTray@Dorkbox";
@Property
/** Permit the StatusTray icon to be displayed next to the clock by installing an extension. By default, gnome places the icon in the
* "notification drawer", which is a collapsible menu at (usually) bottom left corner of the screen.
*/
public static boolean ENABLE_EXTENSION_INSTALL = true;
@Property @Property
/** Permit the gnome-shell to be restarted when the extension is installed. */ /** Permit the gnome-shell to be restarted when the extension is installed. */
public static boolean ENABLE_SHELL_RESTART = true; public static boolean ENABLE_SHELL_RESTART = true;
@ -114,13 +121,18 @@ class Extension {
if (i1 == 0 && i2 == s.length() - 1) { if (i1 == 0 && i2 == s.length() - 1) {
split[i] = s.substring(1, s.length() - 1); split[i] = s.substring(1, s.length() - 1);
} }
}
if (SystemTray.DEBUG) { ArrayList<String> strings = new ArrayList<String>(Arrays.asList(split));
logger.debug(" Cleaning extension: `{}`", split[i]); for (Iterator<String> iterator = strings.iterator(); iterator.hasNext(); ) {
final String string = iterator.next();
if (string.trim()
.isEmpty()) {
iterator.remove();
} }
} }
return new ArrayList<String>(Arrays.asList(split)); return strings;
} }
public static public static
@ -132,6 +144,10 @@ class Extension {
for (int i = 0, extensionsSize = extensions.size(), limit = extensionsSize-1; i < extensionsSize; i++) { for (int i = 0, extensionsSize = extensions.size(), limit = extensionsSize-1; i < extensionsSize; i++) {
final String extension = extensions.get(i); final String extension = extensions.get(i);
if (extension.isEmpty()) {
continue;
}
stringBuilder.append("'") stringBuilder.append("'")
.append(extension) .append(extension)
.append("'"); .append("'");
@ -184,7 +200,7 @@ class Extension {
public static public static
void install() { void install() {
if (!OS.isGnome()) { if (!ENABLE_EXTENSION_INSTALL || !OS.isGnome()) {
return; return;
} }
@ -348,7 +364,7 @@ class Extension {
public static public static
void unInstall() { void unInstall() {
if (!OS.isGnome()) { if (!ENABLE_EXTENSION_INSTALL || !OS.isGnome()) {
return; return;
} }