Commit: 12 - chexaFormation (svn)

カルネージハートエクサのチームデータ編集ツール JAVAベース

Commit MetaInfo

• Revision: 12 (tree)
• Time: 2015-06-09 18:01:27
• Author: manjihq

Log Message

マッチファイルを基準ファイル無しで新規作成出来るようにした

Change Summary

• modified: chexaFormation/trunk/src/chexaformation/mainForm.java
• added: chexaFormation/trunk/src/chexaformation/match.bin
• modified: chexaFormation/trunk/src/chexaformation/cheFile.java

Incremental Difference

--- chexaFormation/trunk/src/chexaformation/mainForm.java	(revision 11)
+++ chexaFormation/trunk/src/chexaformation/mainForm.java	(revision 12)
@@ -7,6 +7,10 @@
 
 import java.awt.Point;
 import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import javax.swing.JDialog;
 import javax.swing.JFileChooser;
 import javax.swing.filechooser.FileNameExtensionFilter;
@@ -113,55 +117,33 @@
     }//GEN-LAST:event_openTeamActionPerformed
 
     private void makeMatchDataActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_makeMatchDataActionPerformed
-        int nret;
-        JFileChooser fdlg = new JFileChooser(Main.cheMatchDataDir);
-        String filterTitle
-                = java.util.ResourceBundle.getBundle("chexaformation/resource").
-                getString("filterTitleCHE");
-        FileNameExtensionFilter ffilter
-                = new FileNameExtensionFilter(filterTitle, "CHE");
-        fdlg.setFileFilter(ffilter);
-        nret = fdlg.showOpenDialog(getRootPane().getParent());
-        if (nret == JFileChooser.APPROVE_OPTION) {
-            File ifile = fdlg.getSelectedFile();
-            cheFile che = new cheFile(ifile.getAbsolutePath());
-            Main.cheMatchDataDir = ifile.getParent();
-            if (che.load() == true) {
-                if (che.is_teamfile() == false) {
-                    JDialog dlg = new JDialog(this,
-                            java.util.ResourceBundle.getBundle(
-                                    "chexaformation/resource").
-                            getString("titleMatchWindow"),
-                            false);
-                    che.set_fname("NEWMATCH.CHE");
-                    che.set_match_name("マッチデータ");
-                    che.clear_oke();
-                    MatchDataPanel panel = new MatchDataPanel(che);
-                    dlg.add(panel);
-                    dlg.pack();
-                    Point pos = this.getLocation();
-                    pos.x += this.getWidth();
-                    dlg.setLocation(pos);
-                    panel.update_title();
-                    dlg.setVisible(true);
-                } else {
-                    Main.mesg_box(this,
-                            java.util.ResourceBundle.getBundle(
-                                    "chexaformation/resource").getString("loadCHE"),
-                            java.util.ResourceBundle.getBundle(
-                                    "chexaformation/resource").
-                            getString("errNotMatchData"),
-                            ifile.getAbsolutePath());
-                }
-            } else {
-                Main.mesg_box(this,
-                        java.util.ResourceBundle.getBundle(
-                                "chexaformation/resource").getString("loadCHE"),
-                        java.util.ResourceBundle.getBundle(
-                                "chexaformation/resource").getString("faileReadCHE"),
-                        ifile.getAbsolutePath());
+        byte matchdata[] = new byte[336];
+        cheFile che = null;
+        try {
+            InputStream ifs = getClass().getResourceAsStream("match.bin");
+            if (ifs.read(matchdata) == matchdata.length) {
+                che = new cheFile(matchdata);
             }
+        } catch (IOException ex) {
+            Logger.getLogger(mainForm.class.getName()).
+                    log(Level.SEVERE, null, ex);
         }
+        if (che != null) {
+            JDialog dlg = new JDialog(this,
+                    java.util.ResourceBundle.getBundle(
+                            "chexaformation/resource").
+                    getString("titleMatchWindow"),
+                    false);
+            che.set_match_name("マッチデータ");
+            MatchDataPanel panel = new MatchDataPanel(che);
+            dlg.add(panel);
+            dlg.pack();
+            Point pos = this.getLocation();
+            pos.x += this.getWidth();
+            dlg.setLocation(pos);
+            panel.update_title();
+            dlg.setVisible(true);
+        }
     }//GEN-LAST:event_makeMatchDataActionPerformed
 
     private void editMatchDataActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_editMatchDataActionPerformed

--- chexaFormation/trunk/src/chexaformation/cheFile.java	(revision 11)
+++ chexaFormation/trunk/src/chexaformation/cheFile.java	(revision 12)
@@ -111,6 +111,24 @@
     /**
      * コンストラクタ
      *
+     * @param d マッチデータパラメータ
+     */
+    public cheFile(byte d[]) {
+        fname = "NEWMATCH.CHE";
+        team_max = 16;
+        oke_max = 32;
+        bteamfile = false;
+        match_data = new byte[336];
+        if (d.length >= 336) {
+            System.arraycopy(d, 0, match_data, 0, 336);
+        }
+        team = new cheTeamData[team_max];
+        oke = new cheOkeData[oke_max];
+    }
+
+    /**
+     * コンストラクタ
+     *
      * @param s CHEファイル名
      */
     public cheFile(String s) {