• R/O
  • SSH
  • HTTPS

mscheduler: Commit


Commit MetaInfo

Révision142 (tree)
l'heure2013-06-24 17:26:10
Auteurminorun

Message de Log

sqlite3導入を実施。

Change Summary

Modification

--- mScheduler/src/versionInfo/VersionInfoData.java (revision 141)
+++ mScheduler/src/versionInfo/VersionInfoData.java (revision 142)
@@ -11,7 +11,7 @@
1111 return revision;
1212 }
1313
14- private static final String version = "1";
15- private static final String revision = "17.1";
14+ private static final String version = "2";
15+ private static final String revision = "0.0";
1616
1717 }
--- mScheduler/src/userInfoData/UserInfoData.java (revision 141)
+++ mScheduler/src/userInfoData/UserInfoData.java (revision 142)
@@ -1,6 +1,7 @@
11 package userInfoData;
22
33 import jScheduleData.JScheduleDataHeader;
4+import jScheduleData.JScheduleDataHeaderSqlite;
45
56 import java.io.File;
67 import java.util.ArrayList;
@@ -303,8 +304,8 @@
303304 * データファイルのヘッダからユーザ名を抽出する
304305 */
305306 private String extractUserName(File file){
306- JScheduleDataHeader jsdh = new JScheduleDataHeader();
307- if (jsdh.readHeader(file) < 0){
307+ JScheduleDataHeaderSqlite jsdh = new JScheduleDataHeaderSqlite(file);
308+ if (jsdh.readHeader() < 0){
308309 return (null);
309310 }
310311 return (jsdh.getUserName());
@@ -323,9 +324,10 @@
323324
324325 /**
325326 * jsmファイルかチェックする
327+ * sqlite3
326328 */
327329 private boolean isJsmFile(File file){
328- return (file.isFile() && file.canRead() && file.getName().endsWith(".jsm"));
330+ return (file.isFile() && file.canRead() && file.getName().endsWith(".sqlite3"));
329331 }
330332
331333 /**
--- mScheduler/src/scheduleData/DateInfo.java (revision 141)
+++ mScheduler/src/scheduleData/DateInfo.java (revision 142)
@@ -12,18 +12,19 @@
1212 public static final int NOT_APPLICABLE = -2; // 対象外(NumberFomatException)
1313
1414 private String yyyy = ""; // 年
15-
1615 private String mm = ""; // 月
17-
1816 private String dd = ""; // 日
19-
2017 private String HH = ""; // 時
21-
2218 private String MM = ""; // 分
2319
24- //***********************************
25- //*
26- //***********************************
20+ /**
21+ *
22+ * @param w_yyyy
23+ * @param w_mm
24+ * @param w_dd
25+ * @param w_HH
26+ * @param w_MM
27+ */
2728 public DateInfo(String w_yyyy,String w_mm,String w_dd,String w_HH,String w_MM){
2829 yyyy= new String(w_yyyy);
2930 mm = new String(w_mm);
@@ -32,9 +33,9 @@
3233 MM = new String(w_MM);
3334 }
3435
35- //***********************************
36- //*
37- //***********************************
36+ /**
37+ * 通常
38+ */
3839 public DateInfo(){
3940
4041 // 現時点の日付情報を取得する
@@ -51,6 +52,18 @@
5152 HH = sd_HH.format(now_date);
5253 MM = sd_MM.format(now_date);
5354 }
55+
56+ /**
57+ *
58+ * @param yyyymmddHHMM
59+ */
60+ public DateInfo(String yyyymmddHHMM){
61+ yyyy = yyyymmddHHMM.substring(0, 4);
62+ mm = yyyymmddHHMM.substring(4, 6);
63+ dd = yyyymmddHHMM.substring(6, 8);
64+ HH = yyyymmddHHMM.substring(8, 10);
65+ MM = yyyymmddHHMM.substring(10, 12);
66+ }
5467
5568 //***********************************
5669 //*
--- mScheduler/src/jScheduleData/JScheduleData.java (revision 141)
+++ mScheduler/src/jScheduleData/JScheduleData.java (revision 142)
@@ -526,7 +526,19 @@
526526 protected TreeMap<String,TreeMap<String,TreeMap<String,ScheduleData>>> getScheduleDataMap(){
527527 return (this.scheduleDataMap);
528528 }
529+
530+ protected void setScheduleDataMap(TreeMap<String,TreeMap<String,TreeMap<String,ScheduleData>>> sdmap){
531+ this.scheduleDataMap = sdmap;
532+ }
529533
534+ protected TreeMap<String, ArrayList<ScheduleData>> getDayScheduleMap(){
535+ return this.dayScheduleMap;
536+ }
537+
538+ protected void setDayScheduleMap(TreeMap<String, ArrayList<ScheduleData>> dsmap){
539+ this.dayScheduleMap = dsmap;
540+ }
541+
530542 /**
531543 *
532544 */
--- mScheduler/src/jScheduleData/JScheduleDataHeader.java (revision 141)
+++ mScheduler/src/jScheduleData/JScheduleDataHeader.java (revision 142)
@@ -32,7 +32,7 @@
3232 /**
3333 * ヘッダ情報を読み込み保管する
3434 */
35- public int readHeader(File file, String userName){
35+ private int readHeader(File file, String userName){
3636 try {
3737 BufferedReader br =
3838 new BufferedReader(new InputStreamReader(new FileInputStream(file.getPath()),"JISAutoDetect"));
@@ -157,14 +157,14 @@
157157 return (0);
158158 }
159159
160- public ArrayList<String> getHeaderStrList(){
161- return headerStrList;
162- }
163-
164160 public String getUserName(){
165161 return userName;
166162 }
167163
164+ public void setUserName(String userName){
165+ this.userName = userName;
166+ }
167+
168168 /**
169169 *
170170 */
@@ -216,14 +216,14 @@
216216 }
217217
218218 //
219- private ArrayList<String> headerStrList;
219+ protected ArrayList<String> headerStrList;
220220
221- private String userName = "";
221+ protected String userName = "";
222222 // private File targetFile;
223223
224224 // Point&Deimension
225- private Point mainFramePoint;
226- private Dimension mainFrameDimension;
227- private Point detailDialogPoint;
228- private Dimension detailDialogDimension;
225+ protected Point mainFramePoint;
226+ protected Dimension mainFrameDimension;
227+ protected Point detailDialogPoint;
228+ protected Dimension detailDialogDimension;
229229 }
--- mScheduler/src/jScheduleData/JScheduleDataCreator.java (revision 141)
+++ mScheduler/src/jScheduleData/JScheduleDataCreator.java (revision 142)
@@ -11,7 +11,7 @@
1111
1212 //
1313 if (jsdcc.getCreateKind() == JScheduleDataCreateConfig.JScheduleDataKind.JSM){
14- return (new JScheduleDataJsm(jsdcc.getUserInfo(), jsdcc.getJsmFile()));
14+ return (new JScheduleDataSqlite(jsdcc.getUserInfo(), jsdcc.getJsmFile()));
1515
1616 }else if (jsdcc.getCreateKind() == JScheduleDataCreateConfig.JScheduleDataKind.GAROON){
1717 return (new JScheduleDataGaroon(jsdcc.getUserInfo(), jsdcc.getGaroonConfig()));
--- mScheduler/src/jScheduleData/AllUserJScheduleData.java (revision 141)
+++ mScheduler/src/jScheduleData/AllUserJScheduleData.java (revision 142)
@@ -120,7 +120,7 @@
120120 File file = new File(currentFileName);
121121 String dirName = file.getAbsoluteFile().getParent();
122122
123- return (dirName + "\\" + userId + ".jsm");
123+ return (dirName + "\\" + userId + ".sqlite3");
124124 }
125125
126126 /**
Afficher sur ancien navigateur de dépôt.