Changeset 9407 for lang/java/NanikaKit

Timestamp:

04/13/08 21:32:19 (5 years ago)

Author:

tarchan

Message:

lang/java/NanikaKit: 里々を実装します

Location:

lang/java/NanikaKit/trunk/src

Files:

• com/mac/tarchan/nanika/SakuraBalloon.java (modified) (3 diffs)
• com/mac/tarchan/nanika/SakuraGhost.java (modified) (7 diffs)
• test/com/mac/tarchan/nanika (modified) (1 prop)
• test/com/mac/tarchan/nanika/NanikaMini.java (modified) (1 diff)
• test/com/mac/tarchan/nanika/NiseSatori.java (added)

lang/java/NanikaKit/trunk/src/com/mac/tarchan/nanika/SakuraBalloon.java

@@ -210 +210 @@
 
         /**
+         * シェルの名前を返します。
+         * 
+         * @return シェルの名前
+         */
+        public String getName()
+        {
+                return descript.getProperty("name");
+        }
+
+        /**
+         * シェルの作成者名を返します。
+         * 
+         * @return シェルの作成者名
+         */
+        public String getCraftman()
+        {
+                return descript.getProperty("craftmanw", descript.getProperty("craftman"));
+        }
+
+        /**
          * 表示オフセットを設定します。
          * 
@@ -249 +269 @@
          * 表示文字列をクリアします。
          */
-        public void clearString()
+        public void clear()
         {
                 buf = "";
@@ -259 +279 @@
          * @param str 文字列
          */
-        public void drawString(CharSequence str)
+        public void append(CharSequence str)
         {
                 buf += str.toString();

lang/java/NanikaKit/trunk/src/com/mac/tarchan/nanika/SakuraGhost.java

@@ -112 +112 @@
                 log.info("materialized");
 
-                requestForSecond();
+//              requestForSecond();
 
                 return this;
@@ -200 +200 @@
         {
 //              currentNar.getBalloon();
-                String name="name";
-                String craftman = "craftman";
-                log.info(String.format("loading Balloon named as \"%s\" crafted by %s", name, craftman));
+                SakuraBalloon balloon = nar.getBalloon("sakura");
+                String name = balloon.getName();
+                String craftman = balloon.getCraftman();
+                log.info(String.format("loading Balloon named as \"%s\" crafted by \"%s\"", name, craftman));
         }
 
@@ -345 +346 @@
                 if (currentShell.getBalloon() != null)
                 {
-                        currentShell.getBalloon().drawString(message);
+                        currentShell.getBalloon().append(message);
                 }
                 repaint();
@@ -359 +360 @@
         public SakuraGhost newLine()
         {
+                if (currentShell.getBalloon() != null)
+                {
+                        currentShell.getBalloon().append("\n");
+                }
+                repaint();
+
                 return this;
         }
@@ -369 +376 @@
         public SakuraGhost halfLine()
         {
+                if (currentShell.getBalloon() != null)
+                {
+                        currentShell.getBalloon().append("\n");
+                }
+                repaint();
+
                 return this;
         }
@@ -381 +394 @@
                 if (currentShell.getBalloon() != null)
                 {
-                        currentShell.getBalloon().clearString();
+                        currentShell.getBalloon().clear();
                 }
                 repaint();
@@ -457 +470 @@
                         AffineTransform tx = new AffineTransform();
                         Rectangle rect = kero.getSurface().getBounds();
-                        rect.x = x + (right - x) / 2 - rect.width / 2;
+//                      rect.x = x + (right - x) / 2 - rect.width / 2;
+                        rect.x = right - rect.width;
                         rect.y = bottom - rect.height;
                         tx.translate(rect.x, rect.y);

lang/java/NanikaKit/trunk/src/test/com/mac/tarchan/nanika

@@ -1 +1 @@
 NiseKawari.java
 
-NiseSatori.java
 
 TestWrappedPoint.java

@@ -1 +1 @@
 NiseKawari.java
 
-NiseSatori.java
 
 TestWrappedPoint.java

lang/java/NanikaKit/trunk/src/test/com/mac/tarchan/nanika/NanikaMini.java

@@ -109 +109 @@
 
                         // ゴーストを実体化
+                        // 華和梨
                         System.setProperty("com.mac.tarchan.nanika.shiori.dll", "test.com.mac.tarchan.nanika.NiseKawari");
+                        // 里々
                         System.setProperty("com.mac.tarchan.nanika.satori.dll", "test.com.mac.tarchan.nanika.NiseSatori");
+                        System.setProperty("com.mac.tarchan.nanika.ruthtsyua.dll", "test.com.mac.tarchan.nanika.NiseSatori");
+                        // 偽栞
+                        System.setProperty("com.mac.tarchan.nanika.niseshiori.dll", "com.mac.tarchan.nanika.SakuraShiori");
+                        // 似非SHIORI
+                        System.setProperty("com.mac.tarchan.nanika.ese-shiori.dll", "com.mac.tarchan.nanika.SakuraShiori");
+                        // Psyche System
+                        System.setProperty("com.mac.tarchan.nanika.psyche.dll", "com.mac.tarchan.nanika.SakuraShiori");
+                        // 翡翠
+                        System.setProperty("com.mac.tarchan.nanika.hisui.dll", "com.mac.tarchan.nanika.SakuraShiori");
+                        // 美坂
+                        System.setProperty("com.mac.tarchan.nanika.misaka.dll", "com.mac.tarchan.nanika.SakuraShiori");
+                        System.setProperty("com.mac.tarchan.nanika.first.dll", "com.mac.tarchan.nanika.SakuraShiori");
+                        // Piro "じゃばこ"
+                        System.setProperty("com.mac.tarchan.nanika.piro.dll", "com.mac.tarchan.nanika.SakuraShiori");
+                        // 文
+                        System.setProperty("com.mac.tarchan.nanika.aya.dll", "com.mac.tarchan.nanika.SakuraShiori");
+
                         ghost.materialize();
 

@@ -1 +1 @@
 NiseKawari.java
 
-NiseSatori.java
 
 TestWrappedPoint.java