summaryrefslogtreecommitdiffstats
path: root/client-compiler
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2013-04-05 16:53:19 +0300
committerVaadin Code Review <review@vaadin.com>2013-04-05 14:01:47 +0000
commitc926a09f54cd08856c8cd7a15fd00cf0b62b63b5 (patch)
treed316521846d1ad38efed6f99ae0b218d7dacf22c /client-compiler
parentfc2e1dfa9e39944c1008d0572ba7cb7c639109bb (diff)
downloadvaadin-framework-c926a09f54cd08856c8cd7a15fd00cf0b62b63b5.tar.gz
vaadin-framework-c926a09f54cd08856c8cd7a15fd00cf0b62b63b5.zip
Global code reformat
Change-Id: I4b3c74ede518aa2712038d1451974a93cdecabc2
Diffstat (limited to 'client-compiler')
-rw-r--r--client-compiler/src/com/vaadin/server/themeutils/SASSAddonImportFileCreator.java7
-rw-r--r--client-compiler/src/com/vaadin/server/widgetsetutils/ClassPathExplorer.java7
2 files changed, 7 insertions, 7 deletions
diff --git a/client-compiler/src/com/vaadin/server/themeutils/SASSAddonImportFileCreator.java b/client-compiler/src/com/vaadin/server/themeutils/SASSAddonImportFileCreator.java
index 1fa259c06b..98ce639d16 100644
--- a/client-compiler/src/com/vaadin/server/themeutils/SASSAddonImportFileCreator.java
+++ b/client-compiler/src/com/vaadin/server/themeutils/SASSAddonImportFileCreator.java
@@ -43,7 +43,6 @@ public class SASSAddonImportFileCreator {
private static final String ADDON_IMPORTS_FILE_TEXT = "This file is managed by the Eclipse plug-in and "
+ "will be overwritten from time to time. Do not manually edit this file.";
-
/**
*
@@ -78,7 +77,8 @@ public class SASSAddonImportFileCreator {
addonImports.createNewFile();
}
- LocationInfo info = ClassPathExplorer.getAvailableWidgetSetsAndStylesheets();
+ LocationInfo info = ClassPathExplorer
+ .getAvailableWidgetSetsAndStylesheets();
try {
PrintStream printStream = new PrintStream(new FileOutputStream(
@@ -113,8 +113,7 @@ public class SASSAddonImportFileCreator {
// Convention is to name the mixing after the stylesheet. Strip
// .scss from filename
String mixin = file.substring(file.lastIndexOf("/") + 1,
- file.length()
- - ".scss".length());
+ file.length() - ".scss".length());
stream.print("@include " + mixin + ";");
}
diff --git a/client-compiler/src/com/vaadin/server/widgetsetutils/ClassPathExplorer.java b/client-compiler/src/com/vaadin/server/widgetsetutils/ClassPathExplorer.java
index 018e19049b..5bc5c0d0ab 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/ClassPathExplorer.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/ClassPathExplorer.java
@@ -84,7 +84,7 @@ public class ClassPathExplorer {
public LocationInfo(Map<String, URL> widgetsets, Map<String, URL> themes) {
this.widgetsets = widgetsets;
- this.addonStyles = themes;
+ addonStyles = themes;
}
public Map<String, URL> getWidgetsets() {
@@ -186,8 +186,9 @@ public class ClassPathExplorer {
* separators) to a URL (see {@link #classpathLocations}) - new
* entries are added to this map
*/
- private static void searchForWidgetSetsAndAddonStyles(String locationString,
- Map<String, URL> widgetsets, Map<String, URL> addonStyles) {
+ private static void searchForWidgetSetsAndAddonStyles(
+ String locationString, Map<String, URL> widgetsets,
+ Map<String, URL> addonStyles) {
URL location = classpathLocations.get(locationString);
File directory = new File(location.getFile());