Browse Source

Adding CSS rules done

Matthias 8 years ago
parent
commit
9c9b7b28a0

+ 1 - 1
scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/main/MainApp.java

@@ -73,7 +73,7 @@ public class MainApp extends Application {
 			GraphDisplayManager.addGraph(Debug.getDefaultUnderlayGraph(), true);
 		}
 
-		CSSManager.addRule("node{text-alignment:at-right; size:15px;}");
+		CSSManager.addRule("node.green{text-alignment: at-right; size: 15px;}");
 	}
 
 	/**

+ 5 - 5
scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/css/CSSCondition.java

@@ -5,7 +5,7 @@ import java.util.Iterator;
 
 class CSSCondition {
 	String type;
-	HashSet<String> classes = new HashSet<String>();
+	HashSet<String> classes;
 	int value;
 
 	public CSSCondition(String type, HashSet<String> classes) {
@@ -33,11 +33,11 @@ class CSSCondition {
 	@Override
 	public String toString() {
 		String ret = "";
-		for (String c : classes){
-			ret.concat(".").concat(c);
+		for (String c : classes) {
+			ret = ret.concat(".").concat(c);
 		}
 		if (type == null)
-			return "bbaa" + ret;
-		return "bbaca" + type.concat(ret);
+			return ret;
+		return type.concat(ret);
 	}
 }

+ 2 - 2
scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/css/CSSManager.java

@@ -14,7 +14,7 @@ public class CSSManager {
 
 	public static void addRule(String rule) {
 		if (!rule.matches(CSS_MATCH_REGEX)) {
-			Debug.out("rule <<" + rule + ">> doesn't match regex");
+			Debug.out("rule << " + rule + " >> doesn't match regex");
 			return;
 		}
 
@@ -22,7 +22,7 @@ public class CSSManager {
 		for (String s : sArray) {
 			CSSRule newRule = extractRule(s);
 			rules.add(newRule);
-			Debug.out(newRule.toString() + " added.");
+			Debug.out("<< " + newRule.toString() + " >> added.");
 		}
 	}
 

+ 1 - 1
scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/css/CSSRule.java

@@ -32,7 +32,7 @@ class CSSRule {
 
 	@Override
 	public String toString() {
-		return "aabb"+conditions.toString().replace("[", "").replace("]", "") + " { " + css + " }";
+		return conditions.toString().replace("[", "").replace("]", "") + " { " + css + " }";
 	}
 
 }