ソースの整形
@@ -62,8 +62,9 @@ | ||
62 | 62 | |
63 | 63 | this.page = page; |
64 | 64 | |
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); | |
67 | 68 | |
68 | 69 | } |
69 | 70 |
@@ -90,6 +91,7 @@ | ||
90 | 91 | * |
91 | 92 | * @return メニューリスト. |
92 | 93 | */ |
94 | + @Override | |
93 | 95 | public ClearfyMenuHolder getMenuList() { |
94 | 96 | return this.menuList; |
95 | 97 | } |
@@ -104,8 +106,9 @@ | ||
104 | 106 | * @param allowUpperLevel |
105 | 107 | * @param targetClass |
106 | 108 | */ |
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) { | |
109 | 112 | String target = targetClass.getCanonicalName(); |
110 | 113 | String section = "null"; |
111 | 114 | if (sectionClass != null) { |
@@ -112,12 +115,14 @@ | ||
112 | 115 | section = sectionClass.getCanonicalName(); |
113 | 116 | } |
114 | 117 | 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," | |
116 | 120 | + " TARGET, SECTION) values (" |
117 | 121 | + " '%s', '%s', '%s', '%s', %d, %d, '%s', '%s' " |
118 | 122 | + ")"; |
119 | 123 | 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); | |
121 | 126 | this.getDataController().execute(cmd); |
122 | 127 | |
123 | 128 | } |
@@ -40,8 +40,9 @@ | ||
40 | 40 | private void registContentHolder(String id) { |
41 | 41 | |
42 | 42 | 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');"; | |
45 | 46 | cmd = String.format(cmd, this.getId(), this.getClass().getName()); |
46 | 47 | this.getDataController().execute(cmd); |
47 | 48 | } |
@@ -145,8 +145,9 @@ | ||
145 | 145 | .getConstructor(String.class, ClearfyPage.class) |
146 | 146 | .newInstance("section", this); |
147 | 147 | } catch (ClassNotFoundException | NoSuchMethodException |
148 | - | SecurityException | InstantiationException | IllegalAccessException | |
149 | - | IllegalArgumentException | InvocationTargetException ex) { | |
148 | + | SecurityException | InstantiationException | |
149 | + | IllegalAccessException | |
150 | + | IllegalArgumentException | InvocationTargetException ex) { | |
150 | 151 | Logger.getLogger(ClearfyPage.class.getName()) |
151 | 152 | .log(Level.SEVERE, null, ex); |
152 | 153 | } |
@@ -168,12 +169,13 @@ | ||
168 | 169 | this.add(this.appTitle); |
169 | 170 | |
170 | 171 | this.pageTitleHead = new Label("pageTitleHead", Model |
171 | - .of(ClearfyPage.APPLICATION_TITLE + " | " + this | |
172 | - .getPageTitle())); | |
172 | + .of(ClearfyPage.APPLICATION_TITLE + " | " | |
173 | + + this | |
174 | + .getPageTitle())); | |
173 | 175 | this.add(this.pageTitleHead); |
174 | 176 | |
175 | 177 | this.pageTitleBody = new Label("pageTitleBody", Model.of(this |
176 | - .getPageTitle())); | |
178 | + .getPageTitle())); | |
177 | 179 | this.add(this.pageTitleBody); |
178 | 180 | |
179 | 181 | } |
@@ -303,28 +305,33 @@ | ||
303 | 305 | public void registMenus() { |
304 | 306 | if (this.getJdbc().isExistTable("MENU")) { |
305 | 307 | 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); | |
310 | 313 | |
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); | |
316 | 321 | |
317 | 322 | 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); | |
322 | 328 | |
323 | 329 | 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); | |
328 | 335 | } |
329 | 336 | } |
330 | 337 |
@@ -342,8 +349,10 @@ | ||
342 | 349 | * @param hasMenuImage |
343 | 350 | */ |
344 | 351 | 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) { | |
347 | 356 | |
348 | 357 | int dHasmenu = 0; |
349 | 358 | if (hasMenuImage) { |
@@ -357,21 +366,27 @@ | ||
357 | 366 | section = sectionClass.getCanonicalName(); |
358 | 367 | } |
359 | 368 | 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," | |
361 | 371 | + " TARGET, SECTION, HAS_ICON) values (" |
362 | 372 | + " '%s', '%s', %d, '%s', '%s', %d, %d, '%s', '%s', %d" |
363 | 373 | + ")"; |
364 | 374 | 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); | |
366 | 378 | this.getJdbc().execute(cmd); |
367 | 379 | |
368 | 380 | } |
369 | 381 | |
370 | 382 | 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) { | |
373 | 386 | 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); | |
375 | 390 | } |
376 | 391 | |
377 | 392 | private String rootPath = ""; |
@@ -476,7 +491,8 @@ | ||
476 | 491 | ); |
477 | 492 | } |
478 | 493 | |
479 | - } catch (ClassNotFoundException | InstantiationException | IllegalAccessException ex) { | |
494 | + } catch (ClassNotFoundException | InstantiationException | |
495 | + | IllegalAccessException ex) { | |
480 | 496 | Logger.getLogger(ClearfyPage.class |
481 | 497 | .getName()).log(Level.SEVERE, null, ex); |
482 | 498 | } |
@@ -555,7 +571,8 @@ | ||
555 | 571 | .log(Level.INFO, "*** Plugin initialize *** " + cname); |
556 | 572 | } |
557 | 573 | |
558 | - } catch (ClassNotFoundException | InstantiationException | IllegalAccessException ex) { | |
574 | + } catch (ClassNotFoundException | InstantiationException | |
575 | + | IllegalAccessException ex) { | |
559 | 576 | Logger.getLogger(ClearfyPage.class |
560 | 577 | .getName()).log(Level.SEVERE, null, ex); |
561 | 578 | } |
@@ -33,57 +33,57 @@ | ||
33 | 33 | */ |
34 | 34 | public interface IInitializer extends IJdbcSupplier { |
35 | 35 | |
36 | - /** | |
37 | - * プラグインの名称を取得する. | |
38 | - * | |
39 | - * @return | |
40 | - */ | |
41 | - public String getPluginName(); | |
36 | + /** | |
37 | + * プラグインの名称を取得する. | |
38 | + * | |
39 | + * @return | |
40 | + */ | |
41 | + public String getPluginName(); | |
42 | 42 | |
43 | - /** | |
44 | - * プラグインのバージョンを取得する. | |
45 | - * | |
46 | - * @return | |
47 | - */ | |
48 | - public String getVersion(); | |
43 | + /** | |
44 | + * プラグインのバージョンを取得する. | |
45 | + * | |
46 | + * @return | |
47 | + */ | |
48 | + public String getVersion(); | |
49 | 49 | |
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); | |
56 | 56 | |
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); | |
63 | 63 | |
64 | - /** | |
65 | - * プラグインが使用するデータベースを初期化する. | |
66 | - */ | |
67 | - public void initDb(); | |
64 | + /** | |
65 | + * プラグインが使用するデータベースを初期化する. | |
66 | + */ | |
67 | + public void initDb(); | |
68 | 68 | |
69 | - /** | |
70 | - * データベース初期化直後に必要とされるデータを登録する. | |
71 | - */ | |
72 | - public void mergeInitialData(); | |
69 | + /** | |
70 | + * データベース初期化直後に必要とされるデータを登録する. | |
71 | + */ | |
72 | + public void mergeInitialData(); | |
73 | 73 | |
74 | - /** | |
75 | - * プラグインが使用するデータベースを削除する. | |
76 | - */ | |
77 | - public void removeDb(); | |
74 | + /** | |
75 | + * プラグインが使用するデータベースを削除する. | |
76 | + */ | |
77 | + public void removeDb(); | |
78 | 78 | |
79 | - /** | |
80 | - * メニューを登録する. | |
81 | - */ | |
82 | - public void registMenus(); | |
79 | + /** | |
80 | + * メニューを登録する. | |
81 | + */ | |
82 | + public void registMenus(); | |
83 | 83 | |
84 | - /** | |
85 | - * メニューを削除する. | |
86 | - */ | |
87 | - public void removeMenus(); | |
84 | + /** | |
85 | + * メニューを削除する. | |
86 | + */ | |
87 | + public void removeMenus(); | |
88 | 88 | |
89 | 89 | } |
@@ -87,8 +87,8 @@ | ||
87 | 87 | @Override |
88 | 88 | public void beforeCreateColumns(List<IColumn<Record, String>> columns) { |
89 | 89 | SelectableColumn controller = new SelectableColumn(new Model<>(this.getSentence("")), |
90 | - "解除", | |
91 | - leftSelecter | |
90 | + "解除", | |
91 | + leftSelecter | |
92 | 92 | ) { |
93 | 93 | @Override |
94 | 94 | public void onSelected(AjaxRequestTarget target, Record selected) { |
@@ -121,8 +121,8 @@ | ||
121 | 121 | @Override |
122 | 122 | public void beforeCreateColumns(List<IColumn<Record, String>> columns) { |
123 | 123 | SelectableColumn controller = new SelectableColumn(new Model<>(this.getSentence("")), |
124 | - "登録", | |
125 | - leftSelecter | |
124 | + "登録", | |
125 | + leftSelecter | |
126 | 126 | ) { |
127 | 127 | @Override |
128 | 128 | public void onSelected(AjaxRequestTarget target, Record selected) { |
@@ -209,13 +209,13 @@ | ||
209 | 209 | public void select(AjaxRequestTarget target) { |
210 | 210 | // 左側 |
211 | 211 | this.leftSelecter.select( |
212 | - this.getSelectSentenceOfLeft(this.getSearchText()) | |
212 | + this.getSelectSentenceOfLeft(this.getSearchText()) | |
213 | 213 | ); |
214 | 214 | target.add(this.leftSelecter); |
215 | 215 | |
216 | 216 | // 右側 |
217 | 217 | this.rightSelecter.select( |
218 | - this.getSelectSentenceOfRight(this.getSearchText()) | |
218 | + this.getSelectSentenceOfRight(this.getSearchText()) | |
219 | 219 | ); |
220 | 220 | target.add(this.rightSelecter); |
221 | 221 |
@@ -53,12 +53,13 @@ | ||
53 | 53 | @Override |
54 | 54 | public void drawContent() { |
55 | 55 | this.selecterCaption = new Label("selecterCaption", |
56 | - Model.of(this.getSentence( | |
57 | - this.getLabelCaption() | |
58 | - ))); | |
56 | + Model.of(this.getSentence( | |
57 | + this.getLabelCaption() | |
58 | + ))); | |
59 | 59 | this.add(this.selecterCaption); |
60 | 60 | |
61 | - this.searchTextField = new AjaxTextField<String>("searchTextField", Model.of("")) { | |
61 | + this.searchTextField = new AjaxTextField<String>("searchTextField", | |
62 | + Model.of("")) { | |
62 | 63 | @Override |
63 | 64 | protected void onChanged(AjaxRequestTarget target) { |
64 | 65 | Selecter.this.onSearchTextChanged(target); |
@@ -68,7 +69,8 @@ | ||
68 | 69 | |
69 | 70 | this.tableView = new TableView("tableView", this.page) { |
70 | 71 | @Override |
71 | - public void beforeCreateColumns(List<IColumn<Record, String>> columns) { | |
72 | + public void beforeCreateColumns( | |
73 | + List<IColumn<Record, String>> columns) { | |
72 | 74 | Selecter.this.onBeforeCreateColumns(columns); |
73 | 75 | } |
74 | 76 |
@@ -105,7 +107,7 @@ | ||
105 | 107 | protected void onBeforeCreateColumns(List<IColumn<Record, String>> columns) { |
106 | 108 | SelectableColumn selcol |
107 | 109 | = new SelectableColumn(new Model<>(""), getSentence("選択"), this |
108 | - .getTableView()) { | |
110 | + .getTableView()) { | |
109 | 111 | @Override |
110 | 112 | public void onSelected(AjaxRequestTarget target, Record selected) { |
111 | 113 | Selecter.this.onSelected(target, selected); |