• R/O
  • SSH
  • HTTPS

clearfybusiness: コミット


コミットメタ情報

リビジョン17 (tree)
日時2017-10-19 01:51:20
作者daianji

ログメッセージ

ソースの整形

変更サマリ

差分

--- org.clearfy/org.clearfy.web/src/main/java/org/clearfy/ClearfyComponent.java (revision 16)
+++ org.clearfy/org.clearfy.web/src/main/java/org/clearfy/ClearfyComponent.java (revision 17)
@@ -62,8 +62,9 @@
6262
6363 this.page = page;
6464
65- this.menuList = new ClearfyMenuHolder(ClearfyComponent.MENU_LIST_ID, this
66- .getId(), this.page);
65+ this.menuList = new ClearfyMenuHolder(ClearfyComponent.MENU_LIST_ID,
66+ this
67+ .getId(), this.page);
6768
6869 }
6970
@@ -90,6 +91,7 @@
9091 *
9192 * @return メニューリスト.
9293 */
94+ @Override
9395 public ClearfyMenuHolder getMenuList() {
9496 return this.menuList;
9597 }
@@ -104,8 +106,9 @@
104106 * @param allowUpperLevel
105107 * @param targetClass
106108 */
107- public void registMenu(String MenuId, String MenuCaptionKey, Class pageClass, int AuthLevel, int allowUpperLevel,
108- Class targetClass, Class sectionClass) {
109+ public void registMenu(String MenuId, String MenuCaptionKey, Class pageClass,
110+ int AuthLevel, int allowUpperLevel,
111+ Class targetClass, Class sectionClass) {
109112 String target = targetClass.getCanonicalName();
110113 String section = "null";
111114 if (sectionClass != null) {
@@ -112,12 +115,14 @@
112115 section = sectionClass.getCanonicalName();
113116 }
114117 String pageClassName = pageClass.getCanonicalName();
115- String cmd = "MERGE into MENU (MENU_KEY, MENU_CAPTION_KEY, CONTENT_HOLDER_ID, PAGE_CLASS, USER_AUTH_LEVEL, ALLOW_UPPER_LEVEL,"
118+ String cmd
119+ = "MERGE into MENU (MENU_KEY, MENU_CAPTION_KEY, CONTENT_HOLDER_ID, PAGE_CLASS, USER_AUTH_LEVEL, ALLOW_UPPER_LEVEL,"
116120 + " TARGET, SECTION) values ("
117121 + " '%s', '%s', '%s', '%s', %d, %d, '%s', '%s' "
118122 + ")";
119123 cmd = String
120- .format(cmd, MenuId, MenuCaptionKey, this.getId(), pageClassName, AuthLevel, allowUpperLevel, target, section);
124+ .format(cmd, MenuId, MenuCaptionKey, this.getId(), pageClassName,
125+ AuthLevel, allowUpperLevel, target, section);
121126 this.getDataController().execute(cmd);
122127
123128 }
--- org.clearfy/org.clearfy.web/src/main/java/org/clearfy/ClearfyContentHolder.java (revision 16)
+++ org.clearfy/org.clearfy.web/src/main/java/org/clearfy/ClearfyContentHolder.java (revision 17)
@@ -40,8 +40,9 @@
4040 private void registContentHolder(String id) {
4141
4242 if (this.getDataController().isExistTable("CONTENT_HOLDER")) {
43- String cmd = "MERGE into CONTENT_HOLDER(CONTENT_HOLDER_ID, CONTENT_HOLDER_CLASS)"
44- + " values ('%s','%s');";
43+ String cmd
44+ = "MERGE into CONTENT_HOLDER(CONTENT_HOLDER_ID, CONTENT_HOLDER_CLASS)"
45+ + " values ('%s','%s');";
4546 cmd = String.format(cmd, this.getId(), this.getClass().getName());
4647 this.getDataController().execute(cmd);
4748 }
--- org.clearfy/org.clearfy.web/src/main/java/org/clearfy/ClearfyPage.java (revision 16)
+++ org.clearfy/org.clearfy.web/src/main/java/org/clearfy/ClearfyPage.java (revision 17)
@@ -145,8 +145,9 @@
145145 .getConstructor(String.class, ClearfyPage.class)
146146 .newInstance("section", this);
147147 } catch (ClassNotFoundException | NoSuchMethodException
148- | SecurityException | InstantiationException | IllegalAccessException
149- | IllegalArgumentException | InvocationTargetException ex) {
148+ | SecurityException | InstantiationException
149+ | IllegalAccessException
150+ | IllegalArgumentException | InvocationTargetException ex) {
150151 Logger.getLogger(ClearfyPage.class.getName())
151152 .log(Level.SEVERE, null, ex);
152153 }
@@ -168,12 +169,13 @@
168169 this.add(this.appTitle);
169170
170171 this.pageTitleHead = new Label("pageTitleHead", Model
171- .of(ClearfyPage.APPLICATION_TITLE + " | " + this
172- .getPageTitle()));
172+ .of(ClearfyPage.APPLICATION_TITLE + " | "
173+ + this
174+ .getPageTitle()));
173175 this.add(this.pageTitleHead);
174176
175177 this.pageTitleBody = new Label("pageTitleBody", Model.of(this
176- .getPageTitle()));
178+ .getPageTitle()));
177179 this.add(this.pageTitleBody);
178180
179181 }
@@ -303,28 +305,33 @@
303305 public void registMenus() {
304306 if (this.getJdbc().isExistTable("MENU")) {
305307 this.registMenu("index", "ホーム", ClearfyMenu.ORDINAL_WEIGHT_PRIMARY,
306- ClearfyPage.ID_TOP_MENU, ClearfyPage.class,
307- ClearfyRoles.AUTH_LEVEL_USER, ClearfyMenu.ALLOW_UPPER_LEVEL,
308- Index.class,
309- null, true);
308+ ClearfyPage.ID_TOP_MENU, ClearfyPage.class,
309+ ClearfyRoles.AUTH_LEVEL_USER,
310+ ClearfyMenu.ALLOW_UPPER_LEVEL,
311+ Index.class,
312+ null, true);
310313
311- this.registMenu("admin", "管理", ClearfyMenu.ORDINAL_WEIGHT_SYSTEM_SETTING,
312- ClearfyPage.ID_TOP_MENU, ClearfyPage.class,
313- ClearfyRoles.AUTH_LEVEL_MANAGEMENT_USER, ClearfyMenu.ALLOW_UPPER_LEVEL,
314- Admin.class,
315- null, true);
314+ this.registMenu("admin", "管理",
315+ ClearfyMenu.ORDINAL_WEIGHT_SYSTEM_SETTING,
316+ ClearfyPage.ID_TOP_MENU, ClearfyPage.class,
317+ ClearfyRoles.AUTH_LEVEL_MANAGEMENT_USER,
318+ ClearfyMenu.ALLOW_UPPER_LEVEL,
319+ Admin.class,
320+ null, true);
316321
317322 this.registMenu("logout", "ログアウト", ClearfyMenu.ORDINAL_WEIGHT_LAST,
318- ClearfyPage.ID_TOP_MENU, ClearfyPage.class,
319- ClearfyRoles.AUTH_LEVEL_USER, ClearfyMenu.ALLOW_UPPER_LEVEL,
320- Logout.class,
321- null, true);
323+ ClearfyPage.ID_TOP_MENU, ClearfyPage.class,
324+ ClearfyRoles.AUTH_LEVEL_USER,
325+ ClearfyMenu.ALLOW_UPPER_LEVEL,
326+ Logout.class,
327+ null, true);
322328
323329 this.registMenu("login", "ログイン", ClearfyMenu.ORDINAL_WEIGHT_LAST,
324- ClearfyPage.ID_TOP_MENU, ClearfyPage.class,
325- ClearfyRoles.AUTH_LEVEL_GUEST, ClearfyMenu.DISALLOW_UPPER_LEVEL,
326- Index.class,
327- null, true);
330+ ClearfyPage.ID_TOP_MENU, ClearfyPage.class,
331+ ClearfyRoles.AUTH_LEVEL_GUEST,
332+ ClearfyMenu.DISALLOW_UPPER_LEVEL,
333+ Index.class,
334+ null, true);
328335 }
329336 }
330337
@@ -342,8 +349,10 @@
342349 * @param hasMenuImage
343350 */
344351 public void registMenu(String MenuId, String MenuCaptionKey, int ordinal,
345- String contentHolderId, Class pageClass, int AuthLevel, int allowUpperLevel,
346- Class targetClass, Class sectionClass, boolean hasMenuImage) {
352+ String contentHolderId, Class pageClass,
353+ int AuthLevel, int allowUpperLevel,
354+ Class targetClass, Class sectionClass,
355+ boolean hasMenuImage) {
347356
348357 int dHasmenu = 0;
349358 if (hasMenuImage) {
@@ -357,21 +366,27 @@
357366 section = sectionClass.getCanonicalName();
358367 }
359368 String pageClassName = pageClass.getCanonicalName();
360- String cmd = "MERGE into MENU (MENU_KEY, MENU_CAPTION_KEY, ORDINAL_WEIGHT, CONTENT_HOLDER_ID, PAGE_CLASS, USER_AUTH_LEVEL, ALLOW_UPPER_LEVEL,"
369+ String cmd
370+ = "MERGE into MENU (MENU_KEY, MENU_CAPTION_KEY, ORDINAL_WEIGHT, CONTENT_HOLDER_ID, PAGE_CLASS, USER_AUTH_LEVEL, ALLOW_UPPER_LEVEL,"
361371 + " TARGET, SECTION, HAS_ICON) values ("
362372 + " '%s', '%s', %d, '%s', '%s', %d, %d, '%s', '%s', %d"
363373 + ")";
364374 cmd = String
365- .format(cmd, MenuId, MenuCaptionKey, ordinal, contentHolderId, pageClassName, AuthLevel, allowUpperLevel, target, section, dHasmenu);
375+ .format(cmd, MenuId, MenuCaptionKey, ordinal, contentHolderId,
376+ pageClassName, AuthLevel, allowUpperLevel, target, section,
377+ dHasmenu);
366378 this.getJdbc().execute(cmd);
367379
368380 }
369381
370382 public void registMenu(String MenuId, String MenuCaptionKey, int ordinal,
371- String contentHolderId, Class pageClass, int AuthLevel, int allowUpperLevel,
372- Class targetClass, Class sectionClass) {
383+ String contentHolderId, Class pageClass,
384+ int AuthLevel, int allowUpperLevel,
385+ Class targetClass, Class sectionClass) {
373386 this
374- .registMenu(MenuId, MenuCaptionKey, ordinal, contentHolderId, pageClass, AuthLevel, allowUpperLevel, targetClass, sectionClass, false);
387+ .registMenu(MenuId, MenuCaptionKey, ordinal, contentHolderId,
388+ pageClass, AuthLevel, allowUpperLevel, targetClass,
389+ sectionClass, false);
375390 }
376391
377392 private String rootPath = "";
@@ -476,7 +491,8 @@
476491 );
477492 }
478493
479- } catch (ClassNotFoundException | InstantiationException | IllegalAccessException ex) {
494+ } catch (ClassNotFoundException | InstantiationException
495+ | IllegalAccessException ex) {
480496 Logger.getLogger(ClearfyPage.class
481497 .getName()).log(Level.SEVERE, null, ex);
482498 }
@@ -555,7 +571,8 @@
555571 .log(Level.INFO, "*** Plugin initialize *** " + cname);
556572 }
557573
558- } catch (ClassNotFoundException | InstantiationException | IllegalAccessException ex) {
574+ } catch (ClassNotFoundException | InstantiationException
575+ | IllegalAccessException ex) {
559576 Logger.getLogger(ClearfyPage.class
560577 .getName()).log(Level.SEVERE, null, ex);
561578 }
--- org.clearfy/org.clearfy.web/src/main/java/org/clearfy/IInitializer.java (revision 16)
+++ org.clearfy/org.clearfy.web/src/main/java/org/clearfy/IInitializer.java (revision 17)
@@ -33,57 +33,57 @@
3333 */
3434 public interface IInitializer extends IJdbcSupplier {
3535
36- /**
37- * プラグインの名称を取得する.
38- *
39- * @return
40- */
41- public String getPluginName();
36+ /**
37+ * プラグインの名称を取得する.
38+ *
39+ * @return
40+ */
41+ public String getPluginName();
4242
43- /**
44- * プラグインのバージョンを取得する.
45- *
46- * @return
47- */
48- public String getVersion();
43+ /**
44+ * プラグインのバージョンを取得する.
45+ *
46+ * @return
47+ */
48+ public String getVersion();
4949
50- /**
51- * データコントローラの登録.
52- *
53- * @param controller
54- */
55- public void setJdbc(Jdbc controller);
50+ /**
51+ * データコントローラの登録.
52+ *
53+ * @param controller
54+ */
55+ public void setJdbc(Jdbc controller);
5656
57- /**
58- * メニュー登録で使うコンポーネントをセットする.
59- *
60- * @param page
61- */
62- public void setClearfyPage(ClearfyPage page);
57+ /**
58+ * メニュー登録で使うコンポーネントをセットする.
59+ *
60+ * @param page
61+ */
62+ public void setClearfyPage(ClearfyPage page);
6363
64- /**
65- * プラグインが使用するデータベースを初期化する.
66- */
67- public void initDb();
64+ /**
65+ * プラグインが使用するデータベースを初期化する.
66+ */
67+ public void initDb();
6868
69- /**
70- * データベース初期化直後に必要とされるデータを登録する.
71- */
72- public void mergeInitialData();
69+ /**
70+ * データベース初期化直後に必要とされるデータを登録する.
71+ */
72+ public void mergeInitialData();
7373
74- /**
75- * プラグインが使用するデータベースを削除する.
76- */
77- public void removeDb();
74+ /**
75+ * プラグインが使用するデータベースを削除する.
76+ */
77+ public void removeDb();
7878
79- /**
80- * メニューを登録する.
81- */
82- public void registMenus();
79+ /**
80+ * メニューを登録する.
81+ */
82+ public void registMenus();
8383
84- /**
85- * メニューを削除する.
86- */
87- public void removeMenus();
84+ /**
85+ * メニューを削除する.
86+ */
87+ public void removeMenus();
8888
8989 }
--- org.clearfy/org.clearfy.web/src/main/java/org/clearfy/components/InOutSelecter.java (revision 16)
+++ org.clearfy/org.clearfy.web/src/main/java/org/clearfy/components/InOutSelecter.java (revision 17)
@@ -87,8 +87,8 @@
8787 @Override
8888 public void beforeCreateColumns(List<IColumn<Record, String>> columns) {
8989 SelectableColumn controller = new SelectableColumn(new Model<>(this.getSentence("")),
90- "解除",
91- leftSelecter
90+ "解除",
91+ leftSelecter
9292 ) {
9393 @Override
9494 public void onSelected(AjaxRequestTarget target, Record selected) {
@@ -121,8 +121,8 @@
121121 @Override
122122 public void beforeCreateColumns(List<IColumn<Record, String>> columns) {
123123 SelectableColumn controller = new SelectableColumn(new Model<>(this.getSentence("")),
124- "登録",
125- leftSelecter
124+ "登録",
125+ leftSelecter
126126 ) {
127127 @Override
128128 public void onSelected(AjaxRequestTarget target, Record selected) {
@@ -209,13 +209,13 @@
209209 public void select(AjaxRequestTarget target) {
210210 // 左側
211211 this.leftSelecter.select(
212- this.getSelectSentenceOfLeft(this.getSearchText())
212+ this.getSelectSentenceOfLeft(this.getSearchText())
213213 );
214214 target.add(this.leftSelecter);
215215
216216 // 右側
217217 this.rightSelecter.select(
218- this.getSelectSentenceOfRight(this.getSearchText())
218+ this.getSelectSentenceOfRight(this.getSearchText())
219219 );
220220 target.add(this.rightSelecter);
221221
--- org.clearfy/org.clearfy.web/src/main/java/org/clearfy/components/Selecter.java (revision 16)
+++ org.clearfy/org.clearfy.web/src/main/java/org/clearfy/components/Selecter.java (revision 17)
@@ -53,12 +53,13 @@
5353 @Override
5454 public void drawContent() {
5555 this.selecterCaption = new Label("selecterCaption",
56- Model.of(this.getSentence(
57- this.getLabelCaption()
58- )));
56+ Model.of(this.getSentence(
57+ this.getLabelCaption()
58+ )));
5959 this.add(this.selecterCaption);
6060
61- this.searchTextField = new AjaxTextField<String>("searchTextField", Model.of("")) {
61+ this.searchTextField = new AjaxTextField<String>("searchTextField",
62+ Model.of("")) {
6263 @Override
6364 protected void onChanged(AjaxRequestTarget target) {
6465 Selecter.this.onSearchTextChanged(target);
@@ -68,7 +69,8 @@
6869
6970 this.tableView = new TableView("tableView", this.page) {
7071 @Override
71- public void beforeCreateColumns(List<IColumn<Record, String>> columns) {
72+ public void beforeCreateColumns(
73+ List<IColumn<Record, String>> columns) {
7274 Selecter.this.onBeforeCreateColumns(columns);
7375 }
7476
@@ -105,7 +107,7 @@
105107 protected void onBeforeCreateColumns(List<IColumn<Record, String>> columns) {
106108 SelectableColumn selcol
107109 = new SelectableColumn(new Model<>(""), getSentence("選択"), this
108- .getTableView()) {
110+ .getTableView()) {
109111 @Override
110112 public void onSelected(AjaxRequestTarget target, Record selected) {
111113 Selecter.this.onSelected(target, selected);
旧リポジトリブラウザで表示