reformat the code

codeborne · May 4, 2016 · cc5637e · cc5637e
1 parent c465393
commit cc5637e
Show file tree

Hide file tree

Showing 9 changed files with 342 additions and 330 deletions.
diff --git a/app/controllers/cms/Admin.java b/app/controllers/cms/Admin.java
@@ -19,47 +19,47 @@
 
 public class Admin extends Controller {
 
-	public static void index() {
-		if (!Profiler.canEnter())
-			forbidden();
-		List<CMSPage> pages = CMSPage.find("order by time desc").fetch();
-		render(pages);
-	}
-
-	public static void editPage(String tmpl, String pageName, Long id) {
-		CMSPage page = id != null ? CMSPage.<CMSPage>findById(id) : CMSPage.findByName(pageName, Lang.get());
-		if (page==null) {
-			page = new CMSPage();
-			page.name = pageName;
-			page.active = true;
-			page.locale = Lang.get();
-		}
-
-		if (!Profiler.canEdit(page.name))
-			forbidden();
-
-		renderTemplate("@edit", page, tmpl);
-	}
-
-	public static void addPage(String tags, String name) {
-		if (!Profiler.canEnter())
-			forbidden();
-		CMSPage page = new CMSPage();
-		page.active = true;
+  public static void index() {
+    if (!Profiler.canEnter())
+      forbidden();
+    List<CMSPage> pages = CMSPage.find("order by time desc").fetch();
+    render(pages);
+  }
+
+  public static void editPage(String tmpl, String pageName, Long id) {
+    CMSPage page = id != null ? CMSPage.findById(id) : CMSPage.findByName(pageName, Lang.get());
+    if (page == null) {
+      page = new CMSPage();
+      page.name = pageName;
+      page.active = true;
+      page.locale = Lang.get();
+    }
+
+    if (!Profiler.canEdit(page.name))
+      forbidden();
+
+    renderTemplate("@edit", page, tmpl);
+  }
+
+  public static void addPage(String tags, String name) {
+    if (!Profiler.canEnter())
+      forbidden();
+    CMSPage page = new CMSPage();
+    page.active = true;
     page.tags = tags;
     page.locale = Lang.get();
     page.name = name;
-		renderTemplate("@edit", page);
-	}
+    renderTemplate("@edit", page);
+  }
 
-	public static void savePage(@Valid CMSPage page, boolean active) throws Throwable {
-		if (!Profiler.canEdit(page.name))
-			forbidden();
+  public static void savePage(@Valid CMSPage page, boolean active) throws Throwable {
+    if (!Profiler.canEdit(page.name))
+      forbidden();
 
     checkAuthenticity();
 
     page.locale = defaultString(page.locale, Lang.get());
-		page.active = active;
+    page.active = active;
 
     if (request.params.get("delete") != null) {
       page.delete();
@@ -70,29 +70,29 @@ public static void savePage(@Valid CMSPage page, boolean active) throws Throwabl
     if (validation.hasErrors())
       renderTemplate("@edit", page);
 
-		page.save();
+    page.save();
     Extension.invoke("afterSave", page);
-		if (request.params.get("savePage") != null)
-			Frontend.show(null, page.name);
-		index();
-	}
-
-	public static void upload(File data) throws Throwable {
-		if (!Profiler.canEnter())
-			forbidden();
+    if (request.params.get("savePage") != null)
+      Frontend.show(null, page.name);
+    index();
+  }
+
+  public static void upload(File data) throws Throwable {
+    if (!Profiler.canEnter())
+      forbidden();
     checkAuthenticity();
 
-		CMSImage image = CMSImage.findById(data.getName());
-		if (image == null) {
-			image = new CMSImage();
-			image.name = data.getName();
-		}
+    CMSImage image = CMSImage.findById(data.getName());
+    if (image == null) {
+      image = new CMSImage();
+      image.name = data.getName();
+    }
     image.lastModified = new Date();
-		image.data = IOUtils.toByteArray(new FileInputStream(data));
-		image.save();
+    image.data = IOUtils.toByteArray(new FileInputStream(data));
+    image.save();
     Extension.invoke("afterSave", image);
-		redirect(Router.reverse("cms.Admin.imagelist").url + "?" + request.querystring);
-	}
+    redirect(Router.reverse("cms.Admin.imagelist").url + "?" + request.querystring);
+  }
 
   public static void delete(String name) throws Throwable {
     if (!Profiler.canEnter())
@@ -105,20 +105,20 @@ public static void delete(String name) throws Throwable {
     redirect(Router.reverse("cms.Admin.imagelist").url + "?" + request.querystring);
   }
 
-	public static void imagelist() {
-		if (!Profiler.canEnter())
-			forbidden();
-		List<CMSImage> images = CMSImage.findAll();
-		render(images);
-	}
+  public static void imagelist() {
+    if (!Profiler.canEnter())
+      forbidden();
+    List<CMSImage> images = CMSImage.findAll();
+    render(images);
+  }
 
   public static class Extension extends Controller {
     static void afterSave(CMSPage page) {}
 
     static void afterDelete(CMSPage page) {}
 
     static void afterSave(CMSImage image) {}
-
+    
     static void afterDelete(CMSImage image) {}
 
     private static Object invoke(String m, Object... args) throws Throwable {

diff --git a/app/controllers/cms/Frontend.java b/app/controllers/cms/Frontend.java
@@ -10,24 +10,24 @@
 import java.text.SimpleDateFormat;
 
 public class Frontend extends Controller {
-	public static void show(String template, String pageName) throws Throwable {
-		CMSPage page = CMSPage.findByName(pageName, Lang.get());
-		if (page == null || !page.active) {
-			if (Profiler.canEdit(pageName))
-				Admin.editPage(null, pageName, null);
-			else
-				notFound();
-		}
-		if (template == null) {
-			template = "cms/default";
-		}
-		renderTemplate("/" + template + ".html", page);
-	}
+  public static void show(String template, String pageName) throws Throwable {
+    CMSPage page = CMSPage.findByName(pageName, Lang.get());
+    if (page == null || !page.active) {
+      if (Profiler.canEdit(pageName))
+        Admin.editPage(null, pageName, null);
+      else
+        notFound();
+    }
+    if (template == null) {
+      template = "cms/default";
+    }
+    renderTemplate("/" + template + ".html", page);
+  }
+
+  public static void image(String name) {
+    flash.keep();
 
-	public static void image(String name) {
-		flash.keep();
-
-		CMSImage image = CMSImage.findById(name);
+    CMSImage image = CMSImage.findById(name);
     if (image == null) notFound();
     response.contentType = MimeTypes.getContentType(name);
     response.setHeader("Last-Modified", new SimpleDateFormat("EEE, d MMM yyyy HH:mm:ss Z").format(image.lastModified));

diff --git a/app/controllers/cms/Profiler.java b/app/controllers/cms/Profiler.java
@@ -7,32 +7,35 @@
 import play.utils.Java;
 
 public class Profiler {
-	public static boolean canEdit(String pageName)  {
-		if (Session.current().get("username")==null)
-			return false;
-		String profile = Play.configuration.getProperty("cms.profile", "admin");
-		boolean result;
-		try {
-			result = (Boolean) invoke(Security.class, "check", profile);
-			return result;
-		} catch (Throwable e) {
-			Logger.error(e, "While checking cms profile");
-			return false;
-		}
-	}
-	public static boolean canEnter()  {
-		if (Session.current().get("username")==null)
-			return false;
-		String profile = Play.configuration.getProperty("cms.profile", "admin");
-		boolean result;
-		try {
-			result = (Boolean) invoke(Security.class, "check", profile);
-			return result;
-		} catch (Throwable e) {
-			Logger.error(e, "While checking cms profile");
-			return false;
-		}
-	}
+  public static boolean canEdit(String pageName) {
+    if (Session.current().get("username") == null)
+      return false;
+    String profile = Play.configuration.getProperty("cms.profile", "admin");
+    boolean result;
+    try {
+      result = (Boolean) invoke(Security.class, "check", profile);
+      return result;
+    }
+    catch (Throwable e) {
+      Logger.error(e, "While checking cms profile");
+      return false;
+    }
+  }
+
+  public static boolean canEnter() {
+    if (Session.current().get("username") == null)
+      return false;
+    String profile = Play.configuration.getProperty("cms.profile", "admin");
+    boolean result;
+    try {
+      result = (Boolean) invoke(Security.class, "check", profile);
+      return result;
+    }
+    catch (Throwable e) {
+      Logger.error(e, "While checking cms profile");
+      return false;
+    }
+  }
 
   private static Object invoke(Class<?> original, String m, Object... args) throws Throwable {
     return Java.invokeChildOrStatic(original, m, args);

diff --git a/app/models/cms/CMSImage.java b/app/models/cms/CMSImage.java
@@ -14,11 +14,11 @@
 @Entity
 public class CMSImage extends GenericModel {
   @Id @Required
-	public String name;
+  public String name;
 
   @Temporal(TIMESTAMP)
   public Date lastModified;
 
-	@Required @Lob
-	public byte[] data;
+  @Required @Lob
+  public byte[] data;
 }
diff --git a/app/models/cms/CMSPage.java b/app/models/cms/CMSPage.java
@@ -18,24 +18,24 @@
 
 @Entity
 public class CMSPage extends Model {
-  public static final CMSPage NULL_PAGE = new CMSPage();
-  public static final String CACHE_EXPIRATION = Play.configuration.getProperty("cms.cache.expiration", "30mn");
+  private static final CMSPage NULL_PAGE = new CMSPage();
+  private static final String CACHE_EXPIRATION = Play.configuration.getProperty("cms.cache.expiration", "30mn");
 
-	@Required public String name;
+  @Required public String name;
   public String locale;
   @Required public String title;
   public String author;
   @Temporal(TIMESTAMP) public Date time = new Date();
   @Temporal(TIMESTAMP) public Date lastEditTime = time;
 
   @Required @Lob
-	@Type(type = "org.hibernate.type.TextType") @Column(length=10000)
-	public String body;
+  @Type(type = "org.hibernate.type.TextType") @Column(length = 10000)
+  public String body;
 
-	public boolean active;
+  public boolean active;
   public boolean editSource;
-	public Integer sort;
-	public String tags;
+  public Integer sort;
+  public String tags;
 
   boolean isNullPage() {
     return id == null && name == null && body == null;
@@ -65,8 +65,8 @@ String cacheKey() {
   }
 
   public static List<CMSPage> findByTag(String tag) {
-		return find("tags like ? order by sort", "%" + tag + "%").fetch();
-	}
+    return find("tags like ? order by sort", "%" + tag + "%").fetch();
+  }
 
   public static CMSPage findByName(String name, String locale) {
     String key = cacheKey(name, locale);

diff --git a/app/views/cms/Admin/edit.html b/app/views/cms/Admin/edit.html
@@ -4,34 +4,34 @@
 #{form @cms.Admin.savePage(), id:'cms-edit-form'}
 <input type="hidden" name="page.id" value="${page.id}">
 <table>
-	<tr>
-		<td>&{'cms.name'}</td>
-		<td><input type="text" size="20" name="page.name" value="${page.name}"></td>
-	</tr>
+  <tr>
+    <td>&{'cms.name'}</td>
+    <td><input type="text" size="20" name="page.name" value="${page.name}"></td>
+  </tr>
   <tr>
     <td>&{'cms.active'}</td>
     <td><input type="checkbox" name="active" #{if page.active}checked="checked"#{/if} value="on"></td>
   </tr>
   <tr>
-		<td>&{'cms.title'}</td>
-		<td><input type="text" size="60" name="page.title" value="${page.title}"> (${page.locale})</td>
-	</tr>
-  <tr>
-		<td>&{'cms.tags'}</td>
-		<td><input type="text" size="60" name="page.tags" value="${page.tags}"></td>
-	</tr>
-	<tr>
-		<td>&{'cms.order'}</td>
-		<td><input type="number" size="5" name="page.sort" value="${page.sort}"></td>
-	</tr>
-	<tr>
-		<td>&{'cms.editSource'}</td>
-		<td><input type="checkbox" name="page.editSource" #{if page.editSource}checked="checked"#{/if} value="on"></td>
-	</tr>
-	<tr>
-		<td>&{'cms.body'}</td>
-		<td><textarea rows="15" cols="60" name="page.body">${page.body}</textarea></td>
-	</tr>
+    <td>&{'cms.title'}</td>
+    <td><input type="text" size="60" name="page.title" value="${page.title}"> (${page.locale})</td>
+  </tr>
+  <tr>
+    <td>&{'cms.tags'}</td>
+    <td><input type="text" size="60" name="page.tags" value="${page.tags}"></td>
+  </tr>
+  <tr>
+    <td>&{'cms.order'}</td>
+    <td><input type="number" size="5" name="page.sort" value="${page.sort}"></td>
+  </tr>
+  <tr>
+    <td>&{'cms.editSource'}</td>
+    <td><input type="checkbox" name="page.editSource" #{if page.editSource}checked="checked"#{/if} value="on"></td>
+  </tr>
+  <tr>
+    <td>&{'cms.body'}</td>
+    <td><textarea rows="15" cols="60" name="page.body">${page.body}</textarea></td>
+  </tr>
   <tr>
     <td></td>
     <td>