From: Olyutorskii Date: Mon, 10 Oct 2022 08:23:25 +0000 (+0900) Subject: Merge commit 'cb03a1ed529387c1084e04e6f141eb9d35d095b8' X-Git-Tag: v4.101.6~2 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=cde32116e69984f1c22380b8ecae9a4d28479adb;hp=d12d773cc29e5ca5efbb5ad879e9e5b373e4c67d;p=jindolf%2FJindolf.git Merge commit 'cb03a1ed529387c1084e04e6f141eb9d35d095b8' --- diff --git a/CHANGELOG.txt b/CHANGELOG.txt index a5da832..143fcd3 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -4,6 +4,12 @@ Jindolf å¤æ´å±¥æ´ +4.101.2 (2020-04-20) + ã»Gå½äº¡å½ã«ä¼´ã JinParser 2.102.2 ã«å¯¾å¿ã + ã»ãã°ã¤ã³ç®¡çç»é¢ã®å»æ¢ã + ã»çºè¨ã¨ãã£ã¿ã®å»æ¢ã + ã»JinArchiverã«ããXMLã¢ã¼ã«ã¤ããã¡ã¤ã«ã®ãã¥ã¼ã¢æ©è½ã + 3.303.106 (2019-05-07) ã»å¿é ç°å¢ãJavaSE8ã«å¼ãä¸ãã ã»Mercurial(3.303.5-SNAPSHOT)ããGit(3.303.105-SNAPSHOT)ã¸SCMãç§»è¡ã diff --git a/README.txt b/README.txt index a0d237c..206473e 100644 --- a/README.txt +++ b/README.txt @@ -26,7 +26,7 @@ - Jindolfã¯GUIãéãã¦æä½ããããã°ã©ã ã®ããããã®å®è¡ã«ããã¦ã¯ ãããããããã£ã¹ãã¬ã¤ã¨ãã¤ã³ãã£ã³ã°ããã¤ã¹ã¨ãã¼ãã¼ãã¸ã®æ¥ç¶ã å¿è¦ã¨ãã¾ãã - - Jindolfã¯äººç¼BBSãµã¼ãã¨HTTPéä¿¡ãè¡ããããTCP/IPãããã¯ã¼ã¯ç°å¢ã + - Jindolfãäººç¼BBSãµã¼ãã¨HTTPéä¿¡ãè¡ãå ´åãTCP/IPãããã¯ã¼ã¯ç°å¢ã å¿è¦ã¨ãã¾ãã - äººç¼BBSã¯ç¬¦å·åãããæ¥æ¬èªã§éã°ãããããJindolfã®å®è¡ã«ã¯æ¥æ¬èªç°å¢ã å¿è¦ã§ãã diff --git a/config/checkstyle/checkstyle-suppressions.xml b/config/checkstyle/checkstyle-suppressions.xml index 6ada9ac..bd37194 100644 --- a/config/checkstyle/checkstyle-suppressions.xml +++ b/config/checkstyle/checkstyle-suppressions.xml @@ -6,7 +6,7 @@ + - + + @@ -40,8 +42,9 @@ - + + diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml index 59fd165..de1218d 100644 --- a/config/checkstyle/checkstyle.xml +++ b/config/checkstyle/checkstyle.xml @@ -6,7 +6,7 @@ - + + + + @@ -44,18 +47,22 @@ + + - + + + @@ -70,10 +77,16 @@ + + + + + + @@ -138,7 +151,9 @@ + + @@ -172,7 +187,9 @@ + + @@ -191,6 +208,10 @@ + + + + @@ -209,6 +230,9 @@ + + + @@ -223,6 +247,9 @@ + + + @@ -313,9 +340,6 @@ - - - diff --git a/config/pmd/pmdrules.xml b/config/pmd/pmdrules.xml index f9c0994..ecf9fa0 100644 --- a/config/pmd/pmdrules.xml +++ b/config/pmd/pmdrules.xml @@ -2,7 +2,7 @@ @@ -11,7 +11,7 @@ xmlns="http://pmd.sourceforge.net/ruleset/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 - http://pmd.sourceforge.net/ruleset_2_0_0.xsd" + https://pmd.sourceforge.io/ruleset_2_0_0.xsd" name="Custom ruleset" > @@ -31,6 +31,7 @@ + diff --git a/pom.xml b/pom.xml index 6eb41cf..0b6f6a7 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ jp.sourceforge.jindolf jindolf - 3.303.106 + 4.101.2 jar Jindolf @@ -79,6 +79,7 @@ 1.8 1.8 + true true @@ -87,27 +88,15 @@ UTF-8 UTF-8 - en - ${locale} - ${locale} - -Duser.language=${locale} + + en + en + -Duser.language=en - - false - - 3.0.0-M3 - 0.8.3 - - 3.0.0 - 8.20 - ${project.basedir}/config/checkstyle/checkstyle.xml - ${project.basedir}/config/checkstyle/checkstyle-suppressions.xml + config/checkstyle/checkstyle.xml + config/checkstyle/checkstyle-suppressions.xml false - 3.12.0 - true - - 3.1.11 Max Low @@ -125,14 +114,14 @@ junit junit - 4.12 + 4.13 test jp.osdn.jindolf jinparser - 2.101.106 + 2.102.2 compile @@ -156,13 +145,134 @@ org.apache.maven.plugins + maven-clean-plugin + 3.1.0 + + + + org.apache.maven.plugins + maven-enforcer-plugin + 3.0.0-M3 + + + + org.apache.maven.plugins + maven-resources-plugin + 3.1.0 + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + + + org.apache.maven.plugins + maven-surefire-plugin + 3.0.0-M4 + + + + org.apache.maven.plugins + maven-surefire-report-plugin + 3.0.0-M4 + + + + org.jacoco + jacoco-maven-plugin + 0.8.5 + + + + org.apache.maven.plugins + maven-jar-plugin + 3.2.0 + + + + org.apache.maven.plugins + maven-shade-plugin + 3.2.1 + + + + org.apache.maven.plugins + maven-source-plugin + 3.2.1 + + + + org.apache.maven.plugins + maven-install-plugin + 3.0.0-M1 + + + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0-M1 + + + + org.apache.maven.plugins + maven-site-plugin + 3.9.0 + + + + org.apache.maven.plugins + maven-assembly-plugin + 3.2.0 + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 3.0.0 + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.2.0 + + + + org.apache.maven.plugins + maven-jxr-plugin + 3.0.0 + + + + org.apache.maven.plugins maven-checkstyle-plugin - ${checkstyle-plugin.version} + 3.1.1 com.puppycrawl.tools checkstyle - ${checkstyleruntime.version} + 8.31 + + + + + + org.apache.maven.plugins + maven-pmd-plugin + 3.13.0 + + + + com.github.spotbugs + spotbugs-maven-plugin + 4.0.0 + + + com.github.spotbugs + spotbugs + 4.0.2 @@ -179,7 +289,6 @@ org.apache.maven.plugins maven-clean-plugin - 3.1.0 @@ -206,7 +315,6 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.0.0-M2 enforce-versions @@ -229,14 +337,7 @@ org.apache.maven.plugins - maven-resources-plugin - 3.1.0 - - - - org.apache.maven.plugins maven-compiler-plugin - 3.8.0 1.8 1.8 @@ -251,7 +352,6 @@ org.apache.maven.plugins maven-surefire-plugin - ${surefire-plugin.version} true @@ -260,7 +360,6 @@ org.jacoco jacoco-maven-plugin - ${jacoco-plugin.version} default-prepare-agent @@ -268,40 +367,12 @@ prepare-agent - - default-report - prepare-package - - report - - - - default-check - - check - - - - - BUNDLE - - - COMPLEXITY - COVEREDRATIO - 0.0 - - - - - - org.apache.maven.plugins maven-jar-plugin - 3.1.1 @@ -321,12 +392,11 @@ org.apache.maven.plugins maven-shade-plugin - 3.2.1 package - shade + shade false @@ -335,60 +405,40 @@ + + org.apache.maven.plugins - maven-source-plugin - 3.0.1 + maven-site-plugin - true - - - ${project.organization.name} - - + ${site.locales} - - - attach-sources - verify - - jar-no-fork - - - - - org.apache.maven.plugins - maven-install-plugin - 3.0.0-M1 - - - org.apache.maven.plugins - maven-deploy-plugin - 3.0.0-M1 - - - - + org.apache.maven.plugins - maven-site-plugin - 3.7.1 + maven-javadoc-plugin - ${site.locales} + ${javadoc.locale} + + -J-Duser.language=${javadoc.locale} + ${maven.compiler.source} + true +

${project.name} ${project.version} API

+ true + false + true + all + protected - - - org.apache.maven.plugins maven-assembly-plugin - 3.1.1 src/assembly/src.xml @@ -398,27 +448,14 @@ org.apache.maven.plugins - maven-checkstyle-plugin - ${checkstyle-plugin.version} - - - - org.apache.maven.plugins maven-pmd-plugin - ${pmd-plugin.version} - ${project.basedir}/config/pmd/pmdrules.xml + config/pmd/pmdrules.xml - - com.github.spotbugs - spotbugs-maven-plugin - ${spotbugs-plugin.version} - - @@ -450,6 +487,8 @@ **/*.gif **/*.jpeg **/*.jpg + + **/*.json **/version.properties @@ -475,7 +514,6 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.0.0 true true @@ -490,7 +528,6 @@ dependencies dependency-convergence plugins - plugin-management team issue-management scm @@ -500,6 +537,7 @@ ci-management mailing-lists modules + plugin-management --> @@ -509,17 +547,18 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.1.0 - false - true - true - protected -

${project.name} ${project.version} API

- true ${javadoc.locale} -J-Duser.language=${javadoc.locale} + ${maven.compiler.source} + true +

${project.name} ${project.version} API

+ true + false + true + all + protected @@ -533,19 +572,16 @@ org.apache.maven.plugins maven-jxr-plugin - 3.0.0 org.apache.maven.plugins maven-surefire-report-plugin - ${surefire-plugin.version} org.jacoco jacoco-maven-plugin - ${jacoco-plugin.version} @@ -558,7 +594,6 @@ org.apache.maven.plugins maven-checkstyle-plugin - ${checkstyle-plugin.version} @@ -571,10 +606,9 @@ org.apache.maven.plugins maven-pmd-plugin - ${pmd-plugin.version} - ${project.basedir}/config/pmd/pmdrules.xml + config/pmd/pmdrules.xml @@ -590,14 +624,76 @@ com.github.spotbugs spotbugs-maven-plugin - ${spotbugs-plugin.version} - + + + + release-profile + + + + performRelease + true + + + + + + + + true + org.apache.maven.plugins + maven-source-plugin + + true + + + ${project.organization.name} + + + + + + attach-sources + + jar-no-fork + + + + + + + true + org.apache.maven.plugins + maven-javadoc-plugin + + protected + + + ${project.organization.name} + + + + + + attach-javadocs + + jar + + + + + + + + + + diff --git a/src/assembly/src.xml b/src/assembly/src.xml index b4f4424..c543c11 100644 --- a/src/assembly/src.xml +++ b/src/assembly/src.xml @@ -8,13 +8,13 @@ > src + tar.gz zip diff --git a/src/main/java/jp/sfjp/jindolf/Controller.java b/src/main/java/jp/sfjp/jindolf/Controller.java index 333268a..e41dcb8 100644 --- a/src/main/java/jp/sfjp/jindolf/Controller.java +++ b/src/main/java/jp/sfjp/jindolf/Controller.java @@ -7,8 +7,6 @@ package jp.sfjp.jindolf; -import java.awt.Component; -import java.awt.Cursor; import java.awt.EventQueue; import java.awt.Frame; import java.awt.Window; @@ -22,7 +20,6 @@ import java.lang.reflect.InvocationTargetException; import java.net.URL; import java.text.MessageFormat; import java.util.List; -import java.util.SortedSet; import java.util.concurrent.Executor; import java.util.concurrent.Executors; import java.util.logging.Handler; @@ -31,12 +28,10 @@ import java.util.logging.Logger; import java.util.regex.Pattern; import javax.swing.JButton; import javax.swing.JDialog; +import javax.swing.JFileChooser; import javax.swing.JOptionPane; import javax.swing.JToolBar; import javax.swing.JTree; -import javax.swing.LookAndFeel; -import javax.swing.SwingUtilities; -import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; import javax.swing.WindowConstants; import javax.swing.event.ChangeEvent; @@ -45,6 +40,8 @@ import javax.swing.event.TreeExpansionEvent; import javax.swing.event.TreeSelectionEvent; import javax.swing.event.TreeSelectionListener; import javax.swing.event.TreeWillExpandListener; +import javax.swing.filechooser.FileFilter; +import javax.swing.filechooser.FileNameExtensionFilter; import javax.swing.tree.TreePath; import jp.sfjp.jindolf.config.AppSetting; import jp.sfjp.jindolf.config.ConfigStore; @@ -52,15 +49,18 @@ import jp.sfjp.jindolf.config.OptionInfo; import jp.sfjp.jindolf.data.Anchor; import jp.sfjp.jindolf.data.DialogPref; import jp.sfjp.jindolf.data.Land; -import jp.sfjp.jindolf.data.LandsModel; +import jp.sfjp.jindolf.data.LandsTreeModel; import jp.sfjp.jindolf.data.Period; import jp.sfjp.jindolf.data.RegexPattern; import jp.sfjp.jindolf.data.Talk; import jp.sfjp.jindolf.data.Village; +import jp.sfjp.jindolf.data.html.PeriodLoader; +import jp.sfjp.jindolf.data.html.VillageInfoLoader; +import jp.sfjp.jindolf.data.html.VillageListLoader; +import jp.sfjp.jindolf.data.xml.VillageLoader; import jp.sfjp.jindolf.dxchg.CsvExporter; import jp.sfjp.jindolf.dxchg.WebIPCDialog; import jp.sfjp.jindolf.dxchg.WolfBBS; -import jp.sfjp.jindolf.editor.TalkPreview; import jp.sfjp.jindolf.glyph.AnchorHitEvent; import jp.sfjp.jindolf.glyph.AnchorHitListener; import jp.sfjp.jindolf.glyph.Discussion; @@ -75,8 +75,8 @@ import jp.sfjp.jindolf.summary.DaySummary; import jp.sfjp.jindolf.summary.VillageDigest; import jp.sfjp.jindolf.util.GUIUtils; import jp.sfjp.jindolf.util.StringUtils; -import jp.sfjp.jindolf.view.AccountPanel; import jp.sfjp.jindolf.view.ActionManager; +import jp.sfjp.jindolf.view.AvatarPics; import jp.sfjp.jindolf.view.FilterPanel; import jp.sfjp.jindolf.view.FindPanel; import jp.sfjp.jindolf.view.HelpFrame; @@ -89,30 +89,38 @@ import jp.sfjp.jindolf.view.TopView; import jp.sfjp.jindolf.view.WindowManager; import jp.sourceforge.jindolf.corelib.VillageState; import jp.sourceforge.jovsonz.JsObject; +import org.xml.sax.SAXException; /** * ããããMVCã§ããã¨ãã®ã³ã³ããã¼ã©ã */ public class Controller implements ActionListener, - TreeWillExpandListener, - TreeSelectionListener, - ChangeListener, AnchorHitListener { private static final Logger LOGGER = Logger.getAnonymousLogger(); private static final String ERRTITLE_LAF = "Look&Feel"; - private static final String ERRFORM_LAF = + private static final String ERRFORM_LAFGEN = "ãã®Look&Feel[{0}]ãçæããäºãã§ãã¾ããã"; - private final LandsModel model; + private final LandsTreeModel model; private final WindowManager windowManager; private final ActionManager actionManager; private final AppSetting appSetting; private final TopView topView; + private final JFileChooser xmlFileChooser = buildFileChooser(); + + private final VillageTreeWatcher treeVillageWatcher = + new VillageTreeWatcher(); + private final ChangeListener tabPeriodWatcher = + new TabPeriodWatcher(); + private final ChangeListener filterWatcher = + new FilterWatcher(); + + private final Executor executor = Executors.newCachedThreadPool(); private volatile boolean isBusyNow; @@ -124,7 +132,7 @@ public class Controller * @param setting ã¢ããªè¨å® */ @SuppressWarnings("LeakingThisInConstructor") - public Controller(LandsModel model, + public Controller(LandsTreeModel model, WindowManager windowManager, ActionManager actionManager, AppSetting setting){ @@ -144,12 +152,13 @@ public class Controller JTree treeView = this.topView.getTreeView(); treeView.setModel(this.model); - treeView.addTreeWillExpandListener(this); - treeView.addTreeSelectionListener(this); + treeView.addTreeWillExpandListener(this.treeVillageWatcher); + treeView.addTreeSelectionListener(this.treeVillageWatcher); - this.topView.getTabBrowser().addChangeListener(this); - this.topView.getTabBrowser().addActionListener(this); - this.topView.getTabBrowser().addAnchorHitListener(this); + TabBrowser periodTab = this.topView.getTabBrowser(); + periodTab.addChangeListener(this.tabPeriodWatcher); + periodTab.addActionListener(this); + periodTab.addAnchorHitListener(this); JButton reloadVillageListButton = this.topView .getLandsTree() @@ -158,12 +167,10 @@ public class Controller reloadVillageListButton.setEnabled(false); TopFrame topFrame = this.windowManager.getTopFrame(); - TalkPreview talkPreview = this.windowManager.getTalkPreview(); OptionPanel optionPanel = this.windowManager.getOptionPanel(); FindPanel findPanel = this.windowManager.getFindPanel(); FilterPanel filterPanel = this.windowManager.getFilterPanel(); LogFrame logFrame = this.windowManager.getLogFrame(); - AccountPanel accountPanel = this.windowManager.getAccountPanel(); HelpFrame helpFrame = this.windowManager.getHelpFrame(); topFrame.setJMenuBar(this.actionManager.getMenuBar()); @@ -178,33 +185,27 @@ public class Controller } }); - filterPanel.addChangeListener(this); + filterPanel.addChangeListener(this.filterWatcher); Handler newHandler = logFrame.getHandler(); LogUtils.switchHandler(newHandler); ConfigStore config = this.appSetting.getConfigStore(); - JsObject draft = config.loadDraftConfig(); - talkPreview.putJson(draft); - JsObject history = config.loadHistoryConfig(); findPanel.putJson(history); FontInfo fontInfo = this.appSetting.getFontInfo(); - this.topView.getTabBrowser().setFontInfo(fontInfo); - talkPreview.setFontInfo(fontInfo); + periodTab.setFontInfo(fontInfo); optionPanel.getFontChooser().setFontInfo(fontInfo); ProxyInfo proxyInfo = this.appSetting.getProxyInfo(); optionPanel.getProxyChooser().setProxyInfo(proxyInfo); DialogPref pref = this.appSetting.getDialogPref(); - this.topView.getTabBrowser().setDialogPref(pref); + periodTab.setDialogPref(pref); optionPanel.getDialogPrefPanel().setDialogPref(pref); - accountPanel.setModel(this.model); - OptionInfo optInfo = this.appSetting.getOptionInfo(); ConfigStore configStore = this.appSetting.getConfigStore(); helpFrame.updateVmInfo(optInfo, configStore); @@ -212,6 +213,54 @@ public class Controller return; } + + /** + * ãã¬ã¼ã è¡¨ç¤ºã®ãã°ã«å¦çã + * @param window ãã¬ã¼ã + */ + private static void toggleWindow(Window window){ + if(window == null) return; + + if(window instanceof Frame){ + Frame frame = (Frame) window; + int winState = frame.getExtendedState(); + boolean isIconified = (winState & Frame.ICONIFIED) != 0; + if(isIconified){ + winState &= ~(Frame.ICONIFIED); + frame.setExtendedState(winState); + frame.setVisible(true); + return; + } + } + + if(window.isVisible()){ + window.setVisible(false); + window.dispose(); + }else{ + window.setVisible(true); + } + return; + } + + /** + * XMLãã¡ã¤ã«ãé¸æããããã®Chooserãçæããã + * + * @return Chooser + */ + private static JFileChooser buildFileChooser(){ + JFileChooser chooser = new JFileChooser(); + chooser.setFileSelectionMode(JFileChooser.FILES_ONLY); + + FileFilter filter; + filter = new FileNameExtensionFilter("XML files (*.xml)", "xml", "XML"); + chooser.setFileFilter(filter); + + chooser.setDialogTitle("ã¢ã¼ã«ã¤ãXMLãã¡ã¤ã«ãéã"); + + return chooser; + } + + /** * ã¦ã£ã³ãã¦ããã¸ã£ãè¿ãã * @return ã¦ã£ã³ãã¦ããã¸ã£ @@ -230,6 +279,87 @@ public class Controller } /** + * ããããã¬ã¼ã ã®ã¿ã¤ãã«ãè¨å®ããã + * ã¿ã¤ãã«ã¯æå®ãããå½oræå + " - Jindolf" + * @param name å½oræå + */ + private void setFrameTitle(String name){ + String title = VerInfo.getFrameTitle(name); + TopFrame topFrame = this.windowManager.getTopFrame(); + topFrame.setTitle(title); + return; + } + + /** + * ç¾å¨é¸æä¸ã®PeriodãååããPeriodViewãè¿ãã + * @return PeriodView + */ + private PeriodView currentPeriodView(){ + TabBrowser tb = this.topView.getTabBrowser(); + PeriodView result = tb.currentPeriodView(); + return result; + } + + /** + * ç¾å¨é¸æä¸ã®PeriodãååããDiscussionãè¿ãã + * @return Discussion + */ + private Discussion currentDiscussion(){ + PeriodView periodView = currentPeriodView(); + if(periodView == null) return null; + Discussion result = periodView.getDiscussion(); + return result; + } + + /** + * ç¾å¨é¸æä¸ã®æãè¿ãã + * + * @return é¸æä¸ã®æããªããã°nullã + */ + private Village getVillage(){ + TabBrowser browser = this.topView.getTabBrowser(); + Village village = browser.getVillage(); + return village; + } + + /** + * ãã¸ã¼ç¶æã®è¨å®ãè¡ãã + * + *

ãã¸ã¼ä¸ã®Actionã³ãã³ãåä¿¡ã¯ç¡è¦ãããã + * + *

ãã¸ã¼ä¸ã®ããããã¬ã¼ã ã®ãã¦ã¹æä½ããã¼ãã¼ãå¥åã¯ + * å¨ã¦ã°ã©ããããããç¡è¦ãããã + * + * @param isBusy trueãªãããã°ã¬ã¹ãã¼ã®ã¢ãã¡éå§&WAITã«ã¼ã½ã«ã + * falseãªãåæ¢&éå¸¸ã«ã¼ã½ã«ã + * @param msg ããã¿ã¡ãã»ã¼ã¸ãnullãªãå¤æ´ãªãã + */ + private void setBusy(boolean isBusy, String msg){ + this.isBusyNow = isBusy; + + TopFrame topFrame = getTopFrame(); + + topFrame.setBusy(isBusy); + if(msg != null){ + this.topView.updateSysMessage(msg); + } + + return; + } + + /** + * ã¹ãã¼ã¿ã¹ãã¼ãæ´æ°ããã + * @param message ã¡ãã»ã¼ã¸ + */ + private void updateStatusBar(String message){ + this.topView.updateSysMessage(message); + return; + } + + /** * ãã¸ã¼ç¶æãè¨å®ããã * *

EDTä»¥å¤ããå¼ã°ããã¨å®éã®å¦çãæ¬¡åã®EDTç§»è¡ã«éå»¶ãããã @@ -237,19 +367,20 @@ public class Controller * @param isBusy ãã¸ã¼ãªãtrue * @param message ã¹ãã¼ã¿ã¹ãã¼è¡¨ç¤ºãnullãªãå¤æ´ãªã */ - public void submitBusyStatus(final boolean isBusy, final String message){ - Runnable task = new Runnable(){ - /** {@inheritDoc} */ - @Override - public void run(){ - if(isBusy) setBusy(true); - if(message != null) updateStatusBar(message); - if( ! isBusy ) setBusy(false); - return; - } + public void submitBusyStatus(boolean isBusy, String message){ + Runnable task = () -> { + setBusy(isBusy, message); }; - EventQueue.invokeLater(task); + if(EventQueue.isDispatchThread()){ + task.run(); + }else{ + try{ + EventQueue.invokeAndWait(task); + }catch(InvocationTargetException | InterruptedException e){ + LOGGER.log(Level.SEVERE, "ãã¸ã¼å¦çã§å¤±æ", e); + } + } return; } @@ -277,26 +408,6 @@ public class Controller } /** - * è»½éã¿ã¹ã¯ãEDTã§å®è¡ããã - * - *

ã¿ã¹ã¯å®è¡ä¸ã¯ãã¸ã¼ç¶æã¨ãªãã - * - *

ã¿ã¹ã¯çµäºæãã¹ãã¼ã¿ã¹æååã¯ã¿ã¹ã¯å®è¡åã®ç¶æã«æ»ãã - * - * @param task è»½éã¿ã¹ã¯ - * @param beforeMsg ãã¸ã¼ä¸ã¹ãã¼ã¿ã¹æååã - * ãã¸ã¼å¾©å¸°æã¯åã®ã¹ãã¼ã¿ã¹æååã«æ»ãã - */ - public void submitLightBusyTask(Runnable task, String beforeMsg){ - String afterMsg = this.topView.getSysMessage(); - submitLightBusyTask(task, beforeMsg, afterMsg); - return; - } - - /** * ééç´ã¿ã¹ã¯ãEDTã¨ã¯å¥ã®ã¹ã¬ããã§å®è¡ããã * *

ã¿ã¹ã¯å®è¡ä¸ã¯ãã¸ã¼ç¶æã¨ãªãã @@ -310,50 +421,26 @@ public class Controller final String afterMsg ){ submitBusyStatus(true, beforeMsg); - final Runnable busyManager = new Runnable(){ - /** {@inheritDoc} */ - @Override - @SuppressWarnings("CallToThreadYield") - public void run(){ - Thread.yield(); + EventQueue.invokeLater(() -> { + fork(() -> { try{ heavyTask.run(); }finally{ submitBusyStatus(false, afterMsg); } - return; - } - }; - - Runnable forkLauncher = new Runnable(){ - /** {@inheritDoc} */ - @Override - public void run(){ - Executor executor = Executors.newCachedThreadPool(); - executor.execute(busyManager); - return; - } - }; - - EventQueue.invokeLater(forkLauncher); + }); + }); return; } /** - * ééç´ã¿ã¹ã¯ãEDTã¨ã¯å¥ã®ã¹ã¬ããã§å®è¡ããã - * - *

ã¿ã¹ã¯å®è¡ä¸ã¯ãã¸ã¼ç¶æã¨ãªãã - * - *

ã¿ã¹ã¯çµäºæãã¹ãã¼ã¿ã¹æååã¯ã¿ã¹ã¯å®è¡åã®ç¶æã«æ»ãã + * ã¹ã¬ãããã¼ã«ãç¨ãã¦éEDTãªã¿ã¹ã¯ãæå¥ããã * - * @param task ééç´ã¿ã¹ã¯ - * @param beforeMsg ãã¸ã¼ä¸ã¹ãã¼ã¿ã¹æååã - * ãã¸ã¼å¾©å¸°æã¯åã®ã¹ãã¼ã¿ã¹æååã«æ»ãã + * @param task ã¿ã¹ã¯ */ - public void submitHeavyBusyTask(Runnable task, String beforeMsg){ - String afterMsg = this.topView.getSysMessage(); - submitHeavyBusyTask(task, beforeMsg, afterMsg); + private void fork(Runnable task){ + this.executor.execute(task); return; } @@ -398,8 +485,7 @@ public class Controller * æãWebãã©ã¦ã¶ã§è¡¨ç¤ºããã */ private void actionShowWebVillage(){ - TabBrowser browser = this.topView.getTabBrowser(); - Village village = browser.getVillage(); + Village village = getVillage(); if(village == null) return; Land land = village.getParentLand(); @@ -421,8 +507,7 @@ public class Controller * æã«å¯¾å¿ããã¾ã¨ããµã¤ããWebãã©ã¦ã¶ã§è¡¨ç¤ºããã */ private void actionShowWebWiki(){ - TabBrowser browser = this.topView.getTabBrowser(); - Village village = browser.getVillage(); + Village village = getVillage(); if(village == null) return; String urlTxt = WolfBBS.getCastGeneratorUrl(village); @@ -441,8 +526,7 @@ public class Controller Period period = periodView.getPeriod(); if(period == null) return; - TabBrowser browser = this.topView.getTabBrowser(); - Village village = browser.getVillage(); + Village village = getVillage(); if(village == null) return; Land land = village.getParentLand(); @@ -451,7 +535,6 @@ public class Controller URL url = server.getPeriodURL(period); String urlText = url.toString(); - if(period.isHot()) urlText += "#bottom"; WebIPCDialog.showDialog(getTopFrame(), urlText); @@ -462,15 +545,14 @@ public class Controller * åå¥ã®çºè¨ãWebãã©ã¦ã¶ã§è¡¨ç¤ºããã */ private void actionShowWebTalk(){ - TabBrowser browser = this.topView.getTabBrowser(); - Village village = browser.getVillage(); + Village village = getVillage(); if(village == null) return; PeriodView periodView = currentPeriodView(); if(periodView == null) return; Discussion discussion = periodView.getDiscussion(); - Talk talk = discussion.getPopupedTalk(); + Talk talk = discussion.getActiveTalk(); if(talk == null) return; Period period = periodView.getPeriod(); @@ -513,70 +595,47 @@ public class Controller } /** - * L&Fã®å¤æ´ãè¡ãã + * L&Fã®å¤æ´æç¤ºãåä¿¡ããã */ private void actionChangeLaF(){ String className = this.actionManager.getSelectedLookAndFeel(); + if(className == null) return; - Class lnfClass; - try{ - lnfClass = Class.forName(className); - }catch(ClassNotFoundException e){ - String warnMsg = MessageFormat.format( - "ãã®Look&Feel[{0}]ãèªã¿è¾¼ãäºãã§ãã¾ããã", - className ); - warnDialog(ERRTITLE_LAF, warnMsg, e); - return; - } - - final LookAndFeel lnf; - try{ - lnf = (LookAndFeel) ( lnfClass.newInstance() ); - }catch( InstantiationException - | IllegalAccessException - | ClassCastException - e){ - String warnMsg = MessageFormat.format(ERRFORM_LAF, className); - warnDialog(ERRTITLE_LAF, warnMsg, e); - return; - } - - Runnable lafTask = new Runnable(){ - @Override - public void run(){ - changeLaF(lnf); - return; - } - }; - - submitLightBusyTask(lafTask, - "Look&Feelãæ´æ°ä¸â¦", - "Look&Feelãæ´æ°ããã¾ãã" ); + submitLightBusyTask( + () -> {taskChangeLaF(className);}, + "Look&Feelãæ´æ°ä¸â¦", + "Look&Feelãæ´æ°ããã¾ãã" + ); return; } /** - * LookAndFeelã®å®éã®æ´æ°ãè¡ãã + * LookAndFeelã®å®éã®æ´æ°ãè¡ãè»½éã¿ã¹ã¯ã + * * @param lnf LookAndFeel */ - private void changeLaF(LookAndFeel lnf){ + private void taskChangeLaF(String className){ assert EventQueue.isDispatchThread(); try{ - UIManager.setLookAndFeel(lnf); + this.windowManager.changeAllWindowUI(className); }catch(UnsupportedLookAndFeelException e){ String warnMsg = MessageFormat.format( "ãã®Look&Feel[{0}]ã¯ãµãã¼ãããã¦ãã¾ããã", - lnf.getName() ); + className); + warnDialog(ERRTITLE_LAF, warnMsg, e); + return; + }catch(ReflectiveOperationException e){ + String warnMsg = MessageFormat.format(ERRFORM_LAFGEN, className); warnDialog(ERRTITLE_LAF, warnMsg, e); return; } - this.windowManager.changeAllWindowUI(); + this.xmlFileChooser.updateUI(); LOGGER.log(Level.INFO, - "Look&Feelã[{0}]ã«å¤æ´ããã¾ããã", lnf.getName() ); + "Look&Feelã[{0}]ã«å¤æ´ããã¾ããã", className ); return; } @@ -591,15 +650,6 @@ public class Controller } /** - * ã¢ã«ã¦ã³ãç®¡çç»é¢ãè¡¨ç¤ºããã - */ - private void actionShowAccount(){ - AccountPanel accountPanel = this.windowManager.getAccountPanel(); - toggleWindow(accountPanel); - return; - } - - /** * ãã°è¡¨ç¤ºç»é¢ãè¡¨ç¤ºããã */ private void actionShowLog(){ @@ -609,15 +659,6 @@ public class Controller } /** - * çºè¨ã¨ãã£ã¿ãè¡¨ç¤ºããã - */ - private void actionTalkPreview(){ - TalkPreview talkPreview = this.windowManager.getTalkPreview(); - toggleWindow(talkPreview); - return; - } - - /** * ãªãã·ã§ã³è¨å®ç»é¢ãè¡¨ç¤ºããã */ private void actionOption(){ @@ -659,11 +700,9 @@ public class Controller this.topView.getTabBrowser().setFontInfo(newFontInfo); - TalkPreview talkPreview = this.windowManager.getTalkPreview(); OptionPanel optionPanel = this.windowManager.getOptionPanel(); FontChooser fontChooser = optionPanel.getFontChooser(); - talkPreview.setFontInfo(newFontInfo); fontChooser.setFontInfo(newFontInfo); return; @@ -706,8 +745,7 @@ public class Controller * æãã¤ã¸ã§ã¹ãç»é¢ãè¡¨ç¤ºããã */ private void actionShowDigest(){ - TabBrowser browser = this.topView.getTabBrowser(); - final Village village = browser.getVillage(); + Village village = getVillage(); if(village == null) return; VillageState villageState = village.getState(); @@ -729,22 +767,20 @@ public class Controller VillageDigest villageDigest = this.windowManager.getVillageDigest(); final VillageDigest digest = villageDigest; - Executor executor = Executors.newCachedThreadPool(); - executor.execute(new Runnable(){ - @Override - public void run(){ - taskFullOpenAllPeriod(); - EventQueue.invokeLater(new Runnable(){ - @Override - public void run(){ - digest.setVillage(village); - digest.setVisible(true); - return; - } - }); - return; - } - }); + + Runnable task = () -> { + taskFullOpenAllPeriod(); + EventQueue.invokeLater(() -> { + digest.setVillage(village); + digest.setVisible(true); + }); + }; + + submitHeavyBusyTask( + task, + "ä¸æ¬èªã¿è¾¼ã¿éå§", + "ä¸æ¬èªã¿è¾¼ã¿å®äº" + ); return; } @@ -754,32 +790,25 @@ public class Controller */ // TODO taskLoadAllPeriodtã¨ä¸ä½åãããã private void taskFullOpenAllPeriod(){ - setBusy(true); - updateStatusBar("ä¸æ¬èªã¿è¾¼ã¿éå§"); - try{ - TabBrowser browser = this.topView.getTabBrowser(); - Village village = browser.getVillage(); - if(village == null) return; - for(PeriodView periodView : browser.getPeriodViewList()){ - Period period = periodView.getPeriod(); - if(period == null) continue; - if(period.isFullOpen()) continue; - String message = - period.getDay() - + "æ¥ç®ã®ãã¼ã¿ãèªã¿è¾¼ãã§ãã¾ã"; - updateStatusBar(message); - try{ - Period.parsePeriod(period, true); - }catch(IOException e){ - showNetworkError(village, e); - return; - } - periodView.showTopics(); + TabBrowser browser = this.topView.getTabBrowser(); + Village village = getVillage(); + if(village == null) return; + for(PeriodView periodView : browser.getPeriodViewList()){ + Period period = periodView.getPeriod(); + if(period == null) continue; + String message = + period.getDay() + + "æ¥ç®ã®ãã¼ã¿ãèªã¿è¾¼ãã§ãã¾ã"; + updateStatusBar(message); + try{ + PeriodLoader.parsePeriod(period, false); + }catch(IOException e){ + showNetworkError(village, e); + return; } - }finally{ - updateStatusBar("ä¸æ¬èªã¿è¾¼ã¿å®äº"); - setBusy(false); + periodView.showTopics(); } + return; } @@ -833,14 +862,11 @@ public class Controller * ä¸æ¬æ¤ç´¢å¦çã */ private void bulkSearch(){ - Executor executor = Executors.newCachedThreadPool(); - executor.execute(new Runnable(){ - @Override - public void run(){ - taskBulkSearch(); - return; - } - }); + submitHeavyBusyTask( + () -> {taskBulkSearch();}, + null, null + ); + return; } /** @@ -965,8 +991,7 @@ public class Controller private void actionReloadPeriod(){ updatePeriod(true); - TabBrowser tabBrowser = this.topView.getTabBrowser(); - Village village = tabBrowser.getVillage(); + Village village = getVillage(); if(village == null) return; if(village.getState() != VillageState.EPILOGUE) return; @@ -991,14 +1016,11 @@ public class Controller * å¨æ¥ç¨ã®ä¸æ¬ãã¼ãã */ private void actionLoadAllPeriod(){ - Executor executor = Executors.newCachedThreadPool(); - executor.execute(new Runnable(){ - @Override - public void run(){ - taskLoadAllPeriod(); - return; - } - }); + submitHeavyBusyTask( + () -> {taskLoadAllPeriod();}, + "ä¸æ¬èªã¿è¾¼ã¿éå§", + "ä¸æ¬èªã¿è¾¼ã¿å®äº" + ); return; } @@ -1007,31 +1029,25 @@ public class Controller * å¨æ¥ç¨ã®ä¸æ¬ãã¼ããããã¼ã¿ã¹ã¯çã */ private void taskLoadAllPeriod(){ - setBusy(true); - updateStatusBar("ä¸æ¬èªã¿è¾¼ã¿éå§"); - try{ - TabBrowser browser = this.topView.getTabBrowser(); - Village village = browser.getVillage(); - if(village == null) return; - for(PeriodView periodView : browser.getPeriodViewList()){ - Period period = periodView.getPeriod(); - if(period == null) continue; - String message = - period.getDay() - + "æ¥ç®ã®ãã¼ã¿ãèªã¿è¾¼ãã§ãã¾ã"; - updateStatusBar(message); - try{ - Period.parsePeriod(period, false); - }catch(IOException e){ - showNetworkError(village, e); - return; - } - periodView.showTopics(); + TabBrowser browser = this.topView.getTabBrowser(); + Village village = getVillage(); + if(village == null) return; + for(PeriodView periodView : browser.getPeriodViewList()){ + Period period = periodView.getPeriod(); + if(period == null) continue; + String message = + period.getDay() + + "æ¥ç®ã®ãã¼ã¿ãèªã¿è¾¼ãã§ãã¾ã"; + updateStatusBar(message); + try{ + PeriodLoader.parsePeriod(period, false); + }catch(IOException e){ + showNetworkError(village, e); + return; } - }finally{ - updateStatusBar("ä¸æ¬èªã¿è¾¼ã¿å®äº"); - setBusy(false); + periodView.showTopics(); } + return; } @@ -1093,6 +1109,28 @@ public class Controller } /** + * ã¢ã³ã«ã¼åãå«ãPeriodã®å¨ä¼è©±ãäºåã«ãã¼ãããã + * + * @param village æ + * @param anchor ã¢ã³ã«ã¼ + * @return ã¢ã³ã«ã¼åãå«ãPeriodã + * ã¢ã³ã«ã¼ãGå½çºè¨çªå·ãªãnullã + * Periodãè¦ã¤ãããªããªãnullã + * @throws IOException å¥åã¨ã©ã¼ + */ + private Period loadAnchoredPeriod(Village village, Anchor anchor) + throws IOException{ + if(anchor.hasTalkNo()) return null; + + Period anchorPeriod = village.getPeriod(anchor); + if(anchorPeriod == null) return null; + + PeriodLoader.parsePeriod(anchorPeriod, false); + + return anchorPeriod; + } + + /** * ã¢ã³ã«ã¼ã«ã¸ã£ã³ãããã */ private void actionJumpAnchor(){ @@ -1100,62 +1138,96 @@ public class Controller if(periodView == null) return; Discussion discussion = periodView.getDiscussion(); - final TabBrowser browser = this.topView.getTabBrowser(); - final Village village = browser.getVillage(); - final Anchor anchor = discussion.getPopupedAnchor(); + TabBrowser browser = this.topView.getTabBrowser(); + Village village = getVillage(); + final Anchor anchor = discussion.getActiveAnchor(); if(anchor == null) return; - Executor executor = Executors.newCachedThreadPool(); - executor.execute(new Runnable(){ - @Override - public void run(){ - setBusy(true); - updateStatusBar("ã¸ã£ã³ãåã®èªã¿è¾¼ã¿ä¸â¦"); + Runnable task = () -> { + if(anchor.hasTalkNo()){ + // TODO ããå°ãè³¢ããªããªãï¼ + taskLoadAllPeriod(); + } - if(anchor.hasTalkNo()){ - // TODO ããå°ãè³¢ããªããªãï¼ - taskLoadAllPeriod(); + final List talkList; + try{ + loadAnchoredPeriod(village, anchor); + talkList = village.getTalkListFromAnchor(anchor); + if(talkList == null || talkList.size() <= 0){ + updateStatusBar( + "ã¢ã³ã«ã¼ã®ã¸ã£ã³ãå[" + + anchor.toString() + + "]ãè¦ã¤ããã¾ãã"); + return; } - final List talkList; - try{ - talkList = village.getTalkListFromAnchor(anchor); - if(talkList == null || talkList.size() <= 0){ - updateStatusBar( - "ã¢ã³ã«ã¼ã®ã¸ã£ã³ãå[" + Talk targetTalk = talkList.get(0); + Period targetPeriod = targetTalk.getPeriod(); + int periodIndex = targetPeriod.getDay(); + PeriodView target = browser.getPeriodView(periodIndex); + + EventQueue.invokeLater(() -> { + browser.showPeriodTab(periodIndex); + target.setPeriod(targetPeriod); + target.scrollToTalk(targetTalk); + }); + updateStatusBar( + "ã¢ã³ã«ã¼[" + anchor.toString() - + "]ãè¦ã¤ããã¾ãã"); - return; - } + + "]ã«ã¸ã£ã³ããã¾ãã"); + }catch(IOException e){ + updateStatusBar( + "ã¢ã³ã«ã¼ã®å±éä¸ã«ã¨ã©ã¼ãèµ·ãã¾ãã"); + } - final Talk targetTalk = talkList.get(0); - final Period targetPeriod = targetTalk.getPeriod(); - final int tabIndex = targetPeriod.getDay() + 1; - final PeriodView target = browser.getPeriodView(tabIndex); - - EventQueue.invokeLater(new Runnable(){ - @Override - public void run(){ - browser.setSelectedIndex(tabIndex); - target.setPeriod(targetPeriod); - target.scrollToTalk(targetTalk); - return; - } - }); - updateStatusBar( - "ã¢ã³ã«ã¼[" - + anchor.toString() - + "]ã«ã¸ã£ã³ããã¾ãã"); - }catch(IOException e){ - updateStatusBar( - "ã¢ã³ã«ã¼ã®å±éä¸ã«ã¨ã©ã¼ãèµ·ãã¾ãã"); - }finally{ - setBusy(false); - } + }; + submitHeavyBusyTask( + task, + "ã¸ã£ã³ãåã®èªã¿è¾¼ã¿ä¸â¦", + null + ); + + return; + } + + /** + * ãã¼ã«ã«ãªXMLãã¡ã¤ã«ãèªã¿è¾¼ãã + */ + private void actionOpenXml(){ + int result = this.xmlFileChooser.showOpenDialog(getTopFrame()); + if(result != JFileChooser.APPROVE_OPTION) return; + File selected = this.xmlFileChooser.getSelectedFile(); + + submitHeavyBusyTask(() -> { + Village village; + + try{ + village = VillageLoader.parseVillage(selected); + }catch(IOException e){ + String warnMsg = MessageFormat.format( + "XMLãã¡ã¤ã«[ {0} ]ãèªã¿è¾¼ããã¨ãã§ãã¾ãã", + selected.getPath() + ); + warnDialog("XML I/O error", warnMsg, e); + return; + }catch(SAXException e){ + String warnMsg = MessageFormat.format( + "XMLãã¡ã¤ã«[ {0} ]ã®å½¢å¼ãä¸æ£ãªããèªã¿è¾¼ããã¨ãã§ãã¾ãã", + selected.getPath() + ); + warnDialog("XML form error", warnMsg, e); return; } - }); + + village.setLocalArchive(true); + AvatarPics avatarPics = village.getAvatarPics(); + this.appSetting.applyLocalImage(avatarPics); + avatarPics.preload(); + EventQueue.invokeLater(() -> { + selectedVillage(village); + }); + }, "XMLèªã¿è¾¼ã¿ä¸", "XMLèªã¿è¾¼ã¿å®äº"); return; } @@ -1165,18 +1237,11 @@ public class Controller * @param land å½ */ private void submitReloadVillageList(final Land land){ - Runnable heavyTask = new Runnable(){ - @Override - public void run(){ - taskReloadVillageList(land); - return; - } - }; - - submitHeavyBusyTask(heavyTask, - "æä¸è¦§ãèªã¿è¾¼ã¿ä¸â¦", - "æä¸è¦§ã®èªã¿è¾¼ã¿å®äº" ); - + submitHeavyBusyTask( + () -> {taskReloadVillageList(land);}, + "æä¸è¦§ãèªã¿è¾¼ã¿ä¸â¦", + "æä¸è¦§ã®èªã¿è¾¼ã¿å®äº" + ); return; } @@ -1185,9 +1250,9 @@ public class Controller * @param land å½ */ private void taskReloadVillageList(Land land){ - SortedSet villageList; + List villageList; try{ - villageList = land.downloadVillageList(); + villageList = VillageListLoader.loadVillageList(land); }catch(IOException e){ showNetworkError(land, e); return; @@ -1207,109 +1272,42 @@ public class Controller * @param force trueãªãPeriodãã¼ã¿ãå¼·å¶åèªã¿è¾¼ã¿ã */ private void updatePeriod(final boolean force){ - final TabBrowser tabBrowser = this.topView.getTabBrowser(); - final Village village = tabBrowser.getVillage(); + Village village = getVillage(); if(village == null) return; - setFrameTitle(village.getVillageFullName()); - final PeriodView periodView = currentPeriodView(); + String fullName = village.getVillageFullName(); + setFrameTitle(fullName); + + PeriodView periodView = currentPeriodView(); Discussion discussion = currentDiscussion(); if(discussion == null) return; + FilterPanel filterPanel = this.windowManager.getFilterPanel(); discussion.setTopicFilter(filterPanel); - final Period period = discussion.getPeriod(); - if(period == null) return; - Executor executor = Executors.newCachedThreadPool(); - executor.execute(new Runnable(){ - @Override - public void run(){ - setBusy(true); - try{ - boolean wasHot = loadPeriod(); - - if(wasHot && ! period.isHot() ){ - if( ! updatePeriodList() ) return; - } + Period period = discussion.getPeriod(); + if(period == null) return; - renderBrowser(); - }finally{ - setBusy(false); - } + Runnable task = () -> { + try{ + PeriodLoader.parsePeriod(period, force); + }catch(IOException e){ + showNetworkError(village, e); return; } - private boolean loadPeriod(){ - updateStatusBar("1æ¥åã®ãã¼ã¿ãèªã¿è¾¼ãã§ãã¾ãâ¦"); - boolean wasHot; - try{ - wasHot = period.isHot(); - try{ - Period.parsePeriod(period, force); - }catch(IOException e){ - showNetworkError(village, e); - } - }finally{ - updateStatusBar("1æ¥åã®ãã¼ã¿ãèªã¿çµããã¾ãã"); - } - return wasHot; - } - - private boolean updatePeriodList(){ - updateStatusBar("ææå ±ãèªã¿ç´ãã¦ãã¾ãâ¦"); - try{ - Village.updateVillage(village); - }catch(IOException e){ - showNetworkError(village, e); - return false; - } - try{ - SwingUtilities.invokeAndWait(new Runnable(){ - @Override - public void run(){ - tabBrowser.setVillage(village); - return; - } - }); - }catch(InvocationTargetException | InterruptedException e){ - LOGGER.log(Level.SEVERE, - "ã¿ãæä½ã§è´å½çãªéå®³ãçºçãã¾ãã", e); - } - updateStatusBar("ææå ±ãèªã¿ç´ãã¾ããâ¦"); - return true; - } + EventQueue.invokeLater(() -> { + int lastPos = periodView.getVerticalPosition(); + periodView.showTopics(); + periodView.setVerticalPosition(lastPos); + }); + }; - private void renderBrowser(){ - updateStatusBar("ã¬ã³ããªã³ã°ä¸â¦"); - try{ - final int lastPos = periodView.getVerticalPosition(); - try{ - SwingUtilities.invokeAndWait(new Runnable(){ - @Override - public void run(){ - periodView.showTopics(); - return; - } - }); - }catch( InvocationTargetException - | InterruptedException - e){ - LOGGER.log(Level.SEVERE, - "ãã©ã¦ã¶è¡¨ç¤ºã§è´å½çãªéå®³ãçºçãã¾ãã", - e ); - } - EventQueue.invokeLater(new Runnable(){ - @Override - public void run(){ - periodView.setVerticalPosition(lastPos); - } - }); - }finally{ - updateStatusBar("ã¬ã³ããªã³ã°å®äº"); - } - return; - } - }); + submitHeavyBusyTask( + task, + "ä¼è©±ã®èªã¿è¾¼ã¿ä¸", + "ä¼è©±ã®è¡¨ç¤ºãå®äº" + ); return; } @@ -1330,55 +1328,6 @@ public class Controller } /** - * ç¾å¨é¸æä¸ã®PeriodãååããPeriodViewãè¿ãã - * @return PeriodView - */ - private PeriodView currentPeriodView(){ - TabBrowser tb = this.topView.getTabBrowser(); - PeriodView result = tb.currentPeriodView(); - return result; - } - - /** - * ç¾å¨é¸æä¸ã®PeriodãååããDiscussionãè¿ãã - * @return Discussion - */ - private Discussion currentDiscussion(){ - PeriodView periodView = currentPeriodView(); - if(periodView == null) return null; - Discussion result = periodView.getDiscussion(); - return result; - } - - /** - * ãã¬ã¼ã è¡¨ç¤ºã®ãã°ã«å¦çã - * @param window ãã¬ã¼ã - */ - private void toggleWindow(Window window){ - if(window == null) return; - - if(window instanceof Frame){ - Frame frame = (Frame) window; - int winState = frame.getExtendedState(); - boolean isIconified = (winState & Frame.ICONIFIED) != 0; - if(isIconified){ - winState &= ~(Frame.ICONIFIED); - frame.setExtendedState(winState); - frame.setVisible(true); - return; - } - } - - if(window.isVisible()){ - window.setVisible(false); - window.dispose(); - }else{ - window.setVisible(true); - } - return; - } - - /** * ãããã¯ã¼ã¯ã¨ã©ã¼ãéç¥ããã¢ã¼ãã«ãã¤ã¢ãã°ãè¡¨ç¤ºããã * OKãã¿ã³ãæ¼ãã¾ã§ãã®ã¡ã½ããã¯æ»ã£ã¦ããªãã * @param village æ @@ -1423,182 +1372,155 @@ public class Controller } /** - * {@inheritDoc} - * ããªã¼ãªã¹ãã§ä½ããã®è¦ç´ ï¼å½ãæï¼ãã¯ãªãã¯ãããã¨ãã®å¦çã - * @param event ã¤ãã³ã {@inheritDoc} + * å½ãé¸æããã + * + * @param land å½ */ - @Override - public void valueChanged(TreeSelectionEvent event){ - TreePath path = event.getNewLeadSelectionPath(); - if(path == null) return; + private void selectedLand(Land land){ + String landName = land.getLandDef().getLandName(); + setFrameTitle(landName); - Object selObj = path.getLastPathComponent(); - - if( selObj instanceof Land ){ - Land land = (Land) selObj; - setFrameTitle(land.getLandDef().getLandName()); - this.topView.showLandInfo(land); - this.actionManager.appearVillage(false); - this.actionManager.appearPeriod(false); - }else if( selObj instanceof Village ){ - final Village village = (Village) selObj; - - Executor executor = Executors.newCachedThreadPool(); - executor.execute(new Runnable(){ - @Override - public void run(){ - setBusy(true); - updateStatusBar("ææå ±ãèªã¿è¾¼ã¿ä¸â¦"); - - try{ - Village.updateVillage(village); - }catch(IOException e){ - showNetworkError(village, e); - return; - }finally{ - updateStatusBar("ææå ±ã®èªã¿è¾¼ã¿å®äº"); - setBusy(false); - } - - Controller.this.actionManager.appearVillage(true); - setFrameTitle(village.getVillageFullName()); + this.actionManager.exposeVillage(false); + this.actionManager.exposePeriod(false); - EventQueue.invokeLater(new Runnable(){ - @Override - public void run(){ - Controller.this.topView.showVillageInfo(village); - return; - } - }); - - return; - } - }); - } + this.topView.showLandInfo(land); return; } /** - * {@inheritDoc} - * Periodãã¿ãé¸æãããã¨ããããã¯çºè¨ãã£ã«ã¿ãæä½ãããã¨ãã®å¦çã - * @param event ã¤ãã³ã {@inheritDoc} + * æãé¸æããã + * + * @param village æ */ - @Override - public void stateChanged(ChangeEvent event){ - Object source = event.getSource(); - - if(source == this.windowManager.getFilterPanel()){ - filterChanged(); - }else if(source instanceof TabBrowser){ - updateFindPanel(); - updatePeriod(false); - PeriodView periodView = currentPeriodView(); - if(periodView == null) this.actionManager.appearPeriod(false); - else this.actionManager.appearPeriod(true); + private void selectedVillage(Village village){ + setFrameTitle(village.getVillageFullName()); + if(village.isLocalArchive()){ + this.actionManager.exposeVillageLocal(true); + }else{ + this.actionManager.exposeVillage(true); } + + Runnable task = () -> { + try{ + if( ! village.hasSchedule() ){ + VillageInfoLoader.updateVillageInfo(village); + } + }catch(IOException e){ + showNetworkError(village, e); + return; + } + + EventQueue.invokeLater(() -> { + this.topView.showVillageInfo(village); + }); + }; + + submitHeavyBusyTask( + task, + "ææå ±ãèªã¿è¾¼ã¿ä¸â¦", + "ææå ±ã®èªã¿è¾¼ã¿å®äº" + ); + return; } /** * {@inheritDoc} - * ä¸»ã«ã¡ãã¥ã¼é¸æããã¿ã³æ¼ä¸ãªã©ã - * @param e ã¤ãã³ã {@inheritDoc} + * + *

ãã¸ã¼ãªç¶æã§ã¯ä½ãããªãã + * + * @param ev {@inheritDoc} */ @Override - public void actionPerformed(ActionEvent e){ + public void actionPerformed(ActionEvent ev){ if(this.isBusyNow) return; - String cmd = e.getActionCommand(); - if(cmd.equals(ActionManager.CMD_ACCOUNT)){ - actionShowAccount(); - }else if(cmd.equals(ActionManager.CMD_EXIT)){ + String cmd = ev.getActionCommand(); + if(cmd == null) return; + + switch(cmd){ + case ActionManager.CMD_OPENXML: + actionOpenXml(); + break; + case ActionManager.CMD_EXIT: actionExit(); - }else if(cmd.equals(ActionManager.CMD_COPY)){ + break; + case ActionManager.CMD_COPY: actionCopySelected(); - }else if(cmd.equals(ActionManager.CMD_SHOWFIND)){ + break; + case ActionManager.CMD_SHOWFIND: actionShowFind(); - }else if(cmd.equals(ActionManager.CMD_SEARCHNEXT)){ + break; + case ActionManager.CMD_SEARCHNEXT: actionSearchNext(); - }else if(cmd.equals(ActionManager.CMD_SEARCHPREV)){ + break; + case ActionManager.CMD_SEARCHPREV: actionSearchPrev(); - }else if(cmd.equals(ActionManager.CMD_ALLPERIOD)){ + break; + case ActionManager.CMD_ALLPERIOD: actionLoadAllPeriod(); - }else if(cmd.equals(ActionManager.CMD_SHOWDIGEST)){ + break; + case ActionManager.CMD_SHOWDIGEST: actionShowDigest(); - }else if(cmd.equals(ActionManager.CMD_WEBVILL)){ + break; + case ActionManager.CMD_WEBVILL: actionShowWebVillage(); - }else if(cmd.equals(ActionManager.CMD_WEBWIKI)){ + break; + case ActionManager.CMD_WEBWIKI: actionShowWebWiki(); - }else if(cmd.equals(ActionManager.CMD_RELOAD)){ + break; + case ActionManager.CMD_RELOAD: actionReloadPeriod(); - }else if(cmd.equals(ActionManager.CMD_DAYSUMMARY)){ + break; + case ActionManager.CMD_DAYSUMMARY: actionDaySummary(); - }else if(cmd.equals(ActionManager.CMD_DAYEXPCSV)){ + break; + case ActionManager.CMD_DAYEXPCSV: actionDayExportCsv(); - }else if(cmd.equals(ActionManager.CMD_WEBDAY)){ + break; + case ActionManager.CMD_WEBDAY: actionShowWebDay(); - }else if(cmd.equals(ActionManager.CMD_OPTION)){ + break; + case ActionManager.CMD_OPTION: actionOption(); - }else if(cmd.equals(ActionManager.CMD_LANDF)){ + break; + case ActionManager.CMD_LANDF: actionChangeLaF(); - }else if(cmd.equals(ActionManager.CMD_SHOWFILT)){ + break; + case ActionManager.CMD_SHOWFILT: actionShowFilter(); - }else if(cmd.equals(ActionManager.CMD_SHOWEDIT)){ - actionTalkPreview(); - }else if(cmd.equals(ActionManager.CMD_SHOWLOG)){ + break; + case ActionManager.CMD_SHOWLOG: actionShowLog(); - }else if(cmd.equals(ActionManager.CMD_HELPDOC)){ + break; + case ActionManager.CMD_HELPDOC: actionHelp(); - }else if(cmd.equals(ActionManager.CMD_SHOWPORTAL)){ + break; + case ActionManager.CMD_SHOWPORTAL: actionShowPortal(); - }else if(cmd.equals(ActionManager.CMD_ABOUT)){ + break; + case ActionManager.CMD_ABOUT: actionAbout(); - }else if(cmd.equals(ActionManager.CMD_VILLAGELIST)){ + break; + case ActionManager.CMD_VILLAGELIST: actionReloadVillageList(); - }else if(cmd.equals(ActionManager.CMD_COPYTALK)){ + break; + case ActionManager.CMD_COPYTALK: actionCopyTalk(); - }else if(cmd.equals(ActionManager.CMD_JUMPANCHOR)){ + break; + case ActionManager.CMD_JUMPANCHOR: actionJumpAnchor(); - }else if(cmd.equals(ActionManager.CMD_WEBTALK)){ + break; + case ActionManager.CMD_WEBTALK: actionShowWebTalk(); - } - return; - } - - /** - * {@inheritDoc} - * æé¸æããªã¼ãªã¹ããç³ã¾ããã¨ãå¼ã°ããã - * @param event ããªã¼ã¤ãã³ã {@inheritDoc} - */ - @Override - public void treeWillCollapse(TreeExpansionEvent event){ - return; - } - - /** - * {@inheritDoc} - * æé¸æããªã¼ãªã¹ããå±éãããã¨ãå¼ã°ããã - * @param event ããªã¼ã¤ãã³ã {@inheritDoc} - */ - @Override - public void treeWillExpand(TreeExpansionEvent event){ - if(!(event.getSource() instanceof JTree)){ - return; + break; + default: + break; } - TreePath path = event.getPath(); - Object lastObj = path.getLastPathComponent(); - if(!(lastObj instanceof Land)){ - return; - } - final Land land = (Land) lastObj; - if(land.getVillageCount() > 0){ - return; - } - - submitReloadVillageList(land); - return; } @@ -1618,140 +1540,230 @@ public class Controller final Anchor anchor = event.getAnchor(); final Discussion discussion = periodView.getDiscussion(); - Executor executor = Executors.newCachedThreadPool(); - executor.execute(new Runnable(){ - @Override - public void run(){ - setBusy(true); - updateStatusBar("ã¢ã³ã«ã¼ã®å±éä¸â¦"); - - if(anchor.hasTalkNo()){ - // TODO ããå°ãè³¢ããªããªãï¼ - taskLoadAllPeriod(); - } + Runnable task = () -> { + if(anchor.hasTalkNo()){ + // TODO ããå°ãè³¢ããªããªãï¼ + taskLoadAllPeriod(); + } - final List talkList; - try{ - talkList = village.getTalkListFromAnchor(anchor); - if(talkList == null || talkList.size() <= 0){ - updateStatusBar( - "ã¢ã³ã«ã¼ã®å±éå[" - + anchor.toString() - + "]ãè¦ã¤ããã¾ãã"); - return; - } - EventQueue.invokeLater(new Runnable(){ - @Override - public void run(){ - talkDraw.showAnchorTalks(anchor, talkList); - discussion.layoutRows(); - return; - } - }); - updateStatusBar( - "ã¢ã³ã«ã¼[" - + anchor.toString() - + "]ã®å±éå®äº"); - }catch(IOException e){ + final List talkList; + try{ + loadAnchoredPeriod(village, anchor); + talkList = village.getTalkListFromAnchor(anchor); + if(talkList == null || talkList.size() <= 0){ updateStatusBar( - "ã¢ã³ã«ã¼ã®å±éä¸ã«ã¨ã©ã¼ãèµ·ãã¾ãã"); - }finally{ - setBusy(false); + "ã¢ã³ã«ã¼ã®å±éå[" + + anchor.toString() + + "]ãè¦ã¤ããã¾ãã"); + return; } - - return; + EventQueue.invokeLater(() -> { + talkDraw.showAnchorTalks(anchor, talkList); + discussion.layoutRows(); + }); + updateStatusBar( + "ã¢ã³ã«ã¼[" + + anchor.toString() + + "]ã®å±éå®äº"); + }catch(IOException e){ + updateStatusBar( + "ã¢ã³ã«ã¼ã®å±éä¸ã«ã¨ã©ã¼ãèµ·ãã¾ãã"); } - }); + }; + + submitHeavyBusyTask( + task, + "ã¢ã³ã«ã¼ã®å±éä¸â¦", + null + ); return; } /** - * ããã¼ãªã¿ã¹ã¯å®è¡ãã¢ãã¼ã«ã - * ããã°ã¬ã¹ãã¼ã¨ã«ã¼ã½ã«ã®è¨å®ãè¡ãã - * @param isBusy trueãªãããã°ã¬ã¹ãã¼ã®ã¢ãã¡éå§&WAITã«ã¼ã½ã«ã - * falseãªãåæ¢&éå¸¸ã«ã¼ã½ã«ã + * ã¢ããªæ£å¸¸çµäºå¦çã */ - private void setBusy(final boolean isBusy){ - this.isBusyNow = isBusy; - - Runnable microJob = new Runnable(){ - @Override - public void run(){ - Cursor cursor; - if(isBusy){ - cursor = Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR); - }else{ - cursor = Cursor.getDefaultCursor(); - } + private void shutdown(){ + ConfigStore configStore = this.appSetting.getConfigStore(); - Component glass = getTopFrame().getGlassPane(); - glass.setCursor(cursor); - glass.setVisible(isBusy); - Controller.this.topView.setBusy(isBusy); + FindPanel findPanel = this.windowManager.getFindPanel(); + JsObject findConf = findPanel.getJson(); + if( ! findPanel.hasConfChanged(findConf) ){ + configStore.saveHistoryConfig(findConf); + } - return; - } - }; + this.appSetting.saveConfig(); - if(SwingUtilities.isEventDispatchThread()){ - microJob.run(); - }else{ - try{ - SwingUtilities.invokeAndWait(microJob); - }catch(InvocationTargetException | InterruptedException e){ - LOGGER.log(Level.SEVERE, "ãã¸ã¼å¦çã§å¤±æ", e); - } - } + LOGGER.info("VMãã¨ã¢ããªã±ã¼ã·ã§ã³ãçµäºãã¾ãã"); + System.exit(0); // invoke shutdown hooks... BYE ! + assert false; return; } + /** - * ã¹ãã¼ã¿ã¹ãã¼ãæ´æ°ããã - * @param message ã¡ãã»ã¼ã¸ + * çºè¨ãã£ã«ã¿æä½ãç£è¦ããã */ - private void updateStatusBar(String message){ - this.topView.updateSysMessage(message); + private class FilterWatcher implements ChangeListener{ + + /** + * constructor. + */ + FilterWatcher(){ + super(); + return; + } + + + /** + * {@inheritDoc} + * + *

çºè¨ãã£ã«ã¿ãæä½ãããã¨ãã®å¦çã + * + * @param event {@inheritDoc} + */ + @Override + public void stateChanged(ChangeEvent event){ + Object source = event.getSource(); + + if(source == Controller.this.windowManager.getFilterPanel()){ + filterChanged(); + } + + return; + } + } /** - * ããããã¬ã¼ã ã®ã¿ã¤ãã«ãè¨å®ããã - * ã¿ã¤ãã«ã¯æå®ãããå½oræå + " - Jindolf" - * @param name å½oræå + * Periodä¸è¦§ã¿ãã®ã¿ãæä½ãç£è¦ããã */ - private void setFrameTitle(String name){ - String title = VerInfo.getFrameTitle(name); - TopFrame topFrame = this.windowManager.getTopFrame(); - topFrame.setTitle(title); - return; + private class TabPeriodWatcher implements ChangeListener{ + + /** + * constructor. + */ + TabPeriodWatcher(){ + super(); + return; + } + + + /** + * {@inheritDoc} + * + *

Periodãã¿ãé¸æãããã¨ãã®å¦çã + * + * @param event {@inheritDoc} + */ + @Override + public void stateChanged(ChangeEvent event){ + Object source = event.getSource(); + + if(source instanceof TabBrowser){ + updateFindPanel(); + updatePeriod(false); + PeriodView periodView = currentPeriodView(); + boolean hasCurrentPeriod; + if(periodView == null) hasCurrentPeriod = false; + else hasCurrentPeriod = true; + Controller.this.actionManager.exposePeriod(hasCurrentPeriod); + if(hasCurrentPeriod){ + Village village = getVillage(); + if(village.isLocalArchive()){ + Controller.this.actionManager.exposeVillageLocal(hasCurrentPeriod); + }else{ + Controller.this.actionManager.exposeVillage(hasCurrentPeriod); + } + } + } + + return; + } + } /** - * ã¢ããªæ£å¸¸çµäºå¦çã + * å½æé¸æãªã¹ãã®é¸æå±éæä½ãç£è¦ããã */ - private void shutdown(){ - ConfigStore configStore = this.appSetting.getConfigStore(); + private class VillageTreeWatcher + implements TreeSelectionListener, TreeWillExpandListener{ - FindPanel findPanel = this.windowManager.getFindPanel(); - JsObject findConf = findPanel.getJson(); - if( ! findPanel.hasConfChanged(findConf) ){ - configStore.saveHistoryConfig(findConf); + /** + * Constructor. + */ + VillageTreeWatcher(){ + super(); + return; } - TalkPreview talkPreview = this.windowManager.getTalkPreview(); - JsObject draftConf = talkPreview.getJson(); - if( ! talkPreview.hasConfChanged(draftConf) ){ - configStore.saveDraftConfig(draftConf); + + /** + * {@inheritDoc} + * + *

ããªã¼ãªã¹ãã§ä½ããã®è¦ç´ ï¼å½ãæï¼ãã¯ãªãã¯ãããã¨ãã®å¦çã + * + * @param event {@inheritDoc} + */ + @Override + public void valueChanged(TreeSelectionEvent event){ + TreePath path = event.getNewLeadSelectionPath(); + if(path == null) return; + + Object selObj = path.getLastPathComponent(); + if(selObj instanceof Land){ + Land land = (Land) selObj; + selectedLand(land); + }else if(selObj instanceof Village){ + Village village = (Village) selObj; + village.setLocalArchive(false); + selectedVillage(village); + } + + return; } - this.appSetting.saveConfig(); + /** + * {@inheritDoc} + * + *

æé¸æããªã¼ãªã¹ããç³ã¾ããã¨ãå¼ã°ããã + * + * @param event ããªã¼ã¤ãã³ã {@inheritDoc} + */ + @Override + public void treeWillCollapse(TreeExpansionEvent event){ + return; + } - LOGGER.info("VMãã¨ã¢ããªã±ã¼ã·ã§ã³ãçµäºãã¾ãã"); - System.exit(0); // invoke shutdown hooks... BYE ! + /** + * {@inheritDoc} + * + *

æé¸æããªã¼ãªã¹ããå±éãããã¨ãå¼ã°ããã + * + * @param event ããªã¼ã¤ãã³ã {@inheritDoc} + */ + @Override + public void treeWillExpand(TreeExpansionEvent event){ + if(!(event.getSource() instanceof JTree)){ + return; + } + + TreePath path = event.getPath(); + Object lastObj = path.getLastPathComponent(); + if(!(lastObj instanceof Land)){ + return; + } + Land land = (Land) lastObj; + if(land.getVillageCount() > 0){ + return; + } + + submitReloadVillageList(land); + + return; + } - assert false; - return; } } diff --git a/src/main/java/jp/sfjp/jindolf/Jindolf.java b/src/main/java/jp/sfjp/jindolf/Jindolf.java index 7bc65bc..3160699 100644 --- a/src/main/java/jp/sfjp/jindolf/Jindolf.java +++ b/src/main/java/jp/sfjp/jindolf/Jindolf.java @@ -35,7 +35,7 @@ public final class Jindolf { * Jindolf ã®ã¹ã¿ã¼ãã¢ããã¨ã³ããªã * *

äºææ§æ¤æ»ãè¡ãããå¾ã - * JRE1.7è§£é¤çã¨ã³ããª{@link JindolfJre17} + * JRE1.8è§£é¤çã¨ã³ããª{@link JindolfJre18} * ã«å¶å¾¡ãæ¸¡ãã * * @param args ã³ãã³ãã©ã¤ã³å¼æ° @@ -46,7 +46,7 @@ public final class Jindolf { exitCode = JreChecker.checkJre(); if(exitCode != 0) System.exit(exitCode); - exitCode = JindolfJre17.main(args); + exitCode = JindolfJre18.main(args); if(exitCode != 0) System.exit(exitCode); // ãã¼ã¢ã³ã¹ã¬ãããããªããã°ã(ã¢ããªç»é¢ãåºã¦ããªããã°) diff --git a/src/main/java/jp/sfjp/jindolf/JindolfJre17.java b/src/main/java/jp/sfjp/jindolf/JindolfJre18.java similarity index 97% rename from src/main/java/jp/sfjp/jindolf/JindolfJre17.java rename to src/main/java/jp/sfjp/jindolf/JindolfJre18.java index bf12492..f3c0176 100644 --- a/src/main/java/jp/sfjp/jindolf/JindolfJre17.java +++ b/src/main/java/jp/sfjp/jindolf/JindolfJre18.java @@ -15,7 +15,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import javax.swing.JOptionPane; /** - * JRE1.7ã®å©ç¨ãè§£ç¦ãããJindolfã¨ã³ããªã + * JRE1.8ã®å©ç¨ãè§£ç¦ãããJindolfã¨ã³ããªã * *

èµ·åã¯ã©ã¹Jindolfã®ä¸è«ãã¨ãã¦ã®æ©è½ãæ³å®ãããã * @@ -24,7 +24,7 @@ import javax.swing.JOptionPane; * *

åç¨®è¨ºæãééããå¾ãJindolfMainã«å¶å¾¡ãæ¸¡ãã */ -public final class JindolfJre17 { +public final class JindolfJre18 { /** GUIç°å¢ã«æ¥ç¶ã§ããªãã¨ãã®çµäºã³ã¼ãã */ public static final int EXIT_CODE_HEADLESS = 1; @@ -72,7 +72,7 @@ public final class JindolfJre17 { /** * é ãã³ã³ã¹ãã©ã¯ã¿ã */ - private JindolfJre17(){ + private JindolfJre18(){ assert false; } @@ -200,7 +200,7 @@ public final class JindolfJre17 { /** * Jindolf ã®ã¹ã¿ã¼ãã¢ããã¨ã³ããªã * - *

ããããJRE1.7ã®å©ç¨ãè§£ç¦ãããã + *

ããããJRE1.8ã®å©ç¨ãè§£ç¦ãããã * *

æçµçã«{@link JindolfMain}ã¸å¶å¾¡ãæ¸¡ãããã * diff --git a/src/main/java/jp/sfjp/jindolf/JindolfMain.java b/src/main/java/jp/sfjp/jindolf/JindolfMain.java index 972ac20..e672c2c 100644 --- a/src/main/java/jp/sfjp/jindolf/JindolfMain.java +++ b/src/main/java/jp/sfjp/jindolf/JindolfMain.java @@ -21,7 +21,7 @@ import jp.sfjp.jindolf.config.CmdOption; import jp.sfjp.jindolf.config.ConfigStore; import jp.sfjp.jindolf.config.EnvInfo; import jp.sfjp.jindolf.config.OptionInfo; -import jp.sfjp.jindolf.data.LandsModel; +import jp.sfjp.jindolf.data.LandsTreeModel; import jp.sfjp.jindolf.log.LogUtils; import jp.sfjp.jindolf.log.LoggingDispatcher; import jp.sfjp.jindolf.util.GUIUtils; @@ -31,7 +31,7 @@ import jp.sfjp.jindolf.view.WindowManager; /** * Jindolf ã¹ã¿ã¼ãã¢ããã¯ã©ã¹ã * - *

{@link JindolfJre17}ã®ä¸è«ãã¨ãã¦æ¬æ ¼çãªJindolfèµ·åå¦çã«å¥ãã + *

{@link JindolfJre18}ã®ä¸è«ãã¨ãã¦æ¬æ ¼çãªJindolfèµ·åå¦çã«å¥ãã */ public final class JindolfMain { @@ -137,7 +137,7 @@ public final class JindolfMain { ConfigStore configStore = appSetting.getConfigStore(); if(configStore.useStoreFile()){ - LOGGER.log(Level.INFO, LOG_CONF, configStore.getConfigPath()); + LOGGER.log(Level.INFO, LOG_CONF, configStore.getConfigDir()); }else{ LOGGER.info(LOG_NOCONF); } @@ -311,7 +311,7 @@ public final class JindolfMain { * @return ã¢ããªã±ã¼ã·ã§ã³ã®ããããã¬ã¼ã */ private static JFrame buildMVC(AppSetting appSetting){ - LandsModel model = new LandsModel(); + LandsTreeModel model = new LandsTreeModel(); WindowManager windowManager = new WindowManager(); ActionManager actionManager = new ActionManager(); diff --git a/src/main/java/jp/sfjp/jindolf/JreChecker.java b/src/main/java/jp/sfjp/jindolf/JreChecker.java index bbfedb6..662d1e0 100644 --- a/src/main/java/jp/sfjp/jindolf/JreChecker.java +++ b/src/main/java/jp/sfjp/jindolf/JreChecker.java @@ -35,7 +35,7 @@ import javax.swing.JOptionPane; public final class JreChecker { /** Jindolfãå®è¡æã«å¿è¦ã¨ããJREã®çã */ - public static final String REQUIRED_JRE_VER = "1.7"; + public static final String REQUIRED_JRE_VER = "1.8"; /** äºææ§ã¨ã©ã¼ã®çµäºã³ã¼ãã */ public static final int EXIT_CODE_INCOMPAT_JRE = 1; @@ -63,6 +63,7 @@ public final class JreChecker { /** * ã¯ã©ã¹åã«ç¸å½ããã¯ã©ã¹ããã¼ãã§ãããå¤å®ããã + * * @param klassName FQDNãªã¯ã©ã¹å * @return ãã¼ãã§ãããtrue */ @@ -81,96 +82,116 @@ public final class JreChecker { /** * JRE 1.1 ç¸å½ã®ã©ã³ã¿ã¤ã ã©ã¤ãã©ãªãæä¾ããã¦ãããå¤å®ããã + * * @return æä¾ããã¦ãããªãtrue * @see java.io.Serializable */ - public static boolean has11Runtime(){ + public static boolean has1_1Runtime(){ boolean result = hasClass("java.io.Serializable"); return result; } /** * JRE 1.2 ç¸å½ã®ã©ã³ã¿ã¤ã ã©ã¤ãã©ãªãæä¾ããã¦ãããå¤å®ããã + * * @return æä¾ããã¦ãããªãtrue * @see java.util.Iterator */ - public static boolean has12Runtime(){ + public static boolean has1_2Runtime(){ boolean result; - if(has11Runtime()) result = hasClass("java.util.Iterator"); + if(has1_1Runtime()) result = hasClass("java.util.Iterator"); else result = false; return result; } /** * JRE 1.3 ç¸å½ã®ã©ã³ã¿ã¤ã ã©ã¤ãã©ãªãæä¾ããã¦ãããå¤å®ããã + * * @return æä¾ããã¦ãããªãtrue * @see java.util.TimerTask */ - public static boolean has13Runtime(){ + public static boolean has1_3Runtime(){ boolean result; - if(has12Runtime()) result = hasClass("java.util.TimerTask"); + if(has1_2Runtime()) result = hasClass("java.util.TimerTask"); else result = false; return result; } /** * JRE 1.4 ç¸å½ã®ã©ã³ã¿ã¤ã ã©ã¤ãã©ãªãæä¾ããã¦ãããå¤å®ããã + * * @return æä¾ããã¦ãããªãtrue * @see java.lang.CharSequence */ - public static boolean has14Runtime(){ + public static boolean has1_4Runtime(){ boolean result; - if(has13Runtime()) result = hasClass("java.lang.CharSequence"); + if(has1_3Runtime()) result = hasClass("java.lang.CharSequence"); else result = false; return result; } /** * JRE 1.5 ç¸å½ã®ã©ã³ã¿ã¤ã ã©ã¤ãã©ãªãæä¾ããã¦ãããå¤å®ããã + * * @return æä¾ããã¦ãããªãtrue * @see java.lang.Appendable */ - public static boolean has15Runtime(){ + public static boolean has1_5Runtime(){ boolean result; - if(has14Runtime()) result = hasClass("java.lang.Appendable"); + if(has1_4Runtime()) result = hasClass("java.lang.Appendable"); else result = false; return result; } /** * JRE 1.6 ç¸å½ã®ã©ã³ã¿ã¤ã ã©ã¤ãã©ãªãæä¾ããã¦ãããå¤å®ããã + * * @return æä¾ããã¦ãããªãtrue * @see java.util.Deque */ - public static boolean has16Runtime(){ + public static boolean has1_6Runtime(){ boolean result; - if(has15Runtime()) result = hasClass("java.util.Deque"); + if(has1_5Runtime()) result = hasClass("java.util.Deque"); else result = false; return result; } /** * JRE 1.7 ç¸å½ã®ã©ã³ã¿ã¤ã ã©ã¤ãã©ãªãæä¾ããã¦ãããå¤å®ããã + * * @return æä¾ããã¦ãããªãtrue * @see java.lang.AutoCloseable */ - public static boolean has17Runtime(){ + public static boolean has1_7Runtime(){ boolean result; - if(has16Runtime()) result = hasClass("java.lang.AutoCloseable"); + if(has1_6Runtime()) result = hasClass("java.lang.AutoCloseable"); else result = false; return result; } - // TODO JRE1.8 å¯¾å¿ + /** + * JRE 1.8 ç¸å½ã®ã©ã³ã¿ã¤ã ã©ã¤ãã©ãªãæä¾ããã¦ãããå¤å®ããã + * + * @return æä¾ããã¦ãããªãtrue + * @see java.lang.AutoCloseable + */ + public static boolean has1_8Runtime(){ + boolean result; + if(has1_7Runtime()) result = hasClass("java.util.stream.Stream"); + else result = false; + return result; + } /** * JREãããã¯java.langããã±ã¼ã¸ã® * ä»æ§ãã¼ã¸ã§ã³ãè¿ãã + * *

ã·ã¹ãã ããããã£java.specification.version *
ã·ã¹ãã ããããã£java.version *
java.langããã±ã¼ã¸ã®ä»æ§ãã¼ã¸ã§ã³ *

ã®é ã§ãã¼ã¸ã§ã³ãæ±ããããã + * * @return ä»æ§ãã¼ã¸ã§ã³æååãä¸æãªãnull */ public static String getLangPkgSpec(){ @@ -199,7 +220,9 @@ public final class JreChecker { /** * JREã®ã¤ã³ã¹ãã¼ã«æå ±ãè¿ãã - * ã·ã¹ãã ããããã£java.homeã®åå¾ãè©¦ã¿ãããã + * + *

ã·ã¹ãã ããããã£java.homeã®åå¾ãè©¦ã¿ãããã + * * @return ã¤ã³ã¹ãã¼ã«æå ±ãä¸æãªãnull */ public static String getJreHome(){ @@ -216,6 +239,7 @@ public final class JreChecker { /** * éäºæã¨ã©ã¼ã¡ãã»ã¼ã¸ãçµã¿ç«ã¦ãã + * * @return ã¨ã©ã¼ã¡ãã»ã¼ã¸ */ public static String buildErrMessage(){ @@ -277,19 +301,19 @@ public final class JreChecker { } /** - * JREç°å¢ããã§ãã¯ããã(JRE1.7) + * JREç°å¢ããã§ãã¯ããã(JRE1.8) * *

ããJREã®éäºææ§ãæ¤åºããããã¨ã©ã¼ã¡ãã»ã¼ã¸ãå ±åããã * * @return äºææ§ãããã°0ãç¡ããã°é0 */ public static int checkJre(){ - if(has17Runtime()) return 0; + if(has1_8Runtime()) return 0; String message = buildErrMessage(); STDERR.println(message); STDERR.flush(); - if(has12Runtime()){ + if(has1_2Runtime()){ showErrorDialog(message); } diff --git a/src/main/java/jp/sfjp/jindolf/ResourceManager.java b/src/main/java/jp/sfjp/jindolf/ResourceManager.java index f360cbb..fad7176 100644 --- a/src/main/java/jp/sfjp/jindolf/ResourceManager.java +++ b/src/main/java/jp/sfjp/jindolf/ResourceManager.java @@ -9,7 +9,6 @@ package jp.sfjp.jindolf; import java.awt.image.BufferedImage; import java.io.BufferedInputStream; -import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; @@ -17,6 +16,7 @@ import java.io.LineNumberReader; import java.io.Reader; import java.net.URL; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.util.Properties; import javax.imageio.ImageIO; import javax.swing.Icon; @@ -33,38 +33,33 @@ import jp.sfjp.jindolf.view.FlexiIcon; * ãªã«ããªã®å¯¾è±¡å¤ã¨ããã(ãã«ãå·¥ç¨ã®ä¸æéæ±ãã) * * @see java.lang.Class#getResource + * @see java.lang.ClassLoader#getResource */ public final class ResourceManager { - /** ãªã½ã¼ã¹åã»ãã¬ã¼ã¿æåã */ - public static final char RES_SEPCHAR = '/'; - /** ããã±ã¼ã¸åã»ãã¬ã¼ã¿æåã */ - public static final char PKG_SEPCHAR = '.'; - - /** ãªã½ã¼ã¹åã»ãã¬ã¼ã¿æååã */ - public static final String RES_SEPARATOR = - Character.toString(RES_SEPCHAR); - /** ããã±ã¼ã¸åã»ãã¬ã¼ã¿æååã */ - public static final String PKG_SEPARATOR = - Character.toString(PKG_SEPCHAR); - /** * ããã©ã«ãã§ç¨ããããã«ã¼ãããã±ã¼ã¸ã - * ç¸å¯¾ãªã½ã¼ã¹åã®èµ·ç¹ã¨ãªãã + * + *

ç¸å¯¾ãªã½ã¼ã¹åã®èµ·ç¹ã¨ãªãã */ public static final Package DEF_ROOT_PACKAGE; - /** ããã©ã«ãã§ç¨ããããã¯ã©ã¹ãã¼ãã */ - public static final ClassLoader DEF_LOADER; - private static final Charset CS_UTF8 = Charset.forName("UTF-8"); + private static final Class ROOT_KLASS = Jindolf.class; + + private static final ClassLoader DEF_LOADER; + + private static final char PKG_SEPCHAR = '.'; + private static final char RES_SEPCHAR = '/'; + private static final String RES_SEPARATOR = + Character.toString(RES_SEPCHAR); + + private static final Charset CS_UTF8 = StandardCharsets.UTF_8; private static final int BTN_SZ = 24; static{ - Class rootKlass = Jindolf.class; - - DEF_ROOT_PACKAGE = rootKlass.getPackage(); - DEF_LOADER = rootKlass.getClassLoader(); + DEF_ROOT_PACKAGE = ROOT_KLASS.getPackage(); + DEF_LOADER = ROOT_KLASS.getClassLoader(); } @@ -79,16 +74,18 @@ public final class ResourceManager { /** * ãªã½ã¼ã¹åãçµ¶å¯¾ãã¹ãå¦ãå¤å®ããã * - *

ãªã½ã¼ã¹åãã/ãã§å§ã¾ãå ´åçµ¶å¯¾ãã¹ã¨ã¿ãªãããã + *

ãªã½ã¼ã¹åãã/ãã§å§ã¾ãå ´åã + * {@link Class}ç¨ã®çµ¶å¯¾ãã¹ã¨ã¿ãªãããã * - *

ãã®ãªã½ã¼ã¹åã¯{@link Class}ç¨ã§ãã£ã¦ - * {@link ClassLoader}ç¨ã§ã¯ãªãã + *

ã/ãã§å§ã¾ããªã½ã¼ã¹åè¡¨è¨ã¯{@link Class}ç¨ã§ãã£ã¦ + * {@link ClassLoader}ã§ã¯ä¸è¦ã * * @param resPath ãªã½ã¼ã¹å * @return çµ¶å¯¾ãã¹ãªãtrueãè¿ãã * @see java.lang.Class#getResource + * @see java.lang.ClassLoader#getResource */ - public static boolean isAbsoluteResourcePath(String resPath){ + private static boolean isAbsoluteResourcePath(String resPath){ if (resPath.startsWith(RES_SEPARATOR)) return true; return false; } @@ -104,19 +101,25 @@ public final class ResourceManager { * {@link Class}ç¨ã§ã¯ãªãã®ã§ã * é ã«ã/ããä»ããªãã * + *

ããã±ã¼ã¸ãcom.example.testãã® + * ãªã½ã¼ã¹ååç½®è©ã¯ãcom/example/test/ã + * * @param pkg ããã±ã¼ã¸è¨å®ãnullã¯ç¡åããã±ã¼ã¸ã¨èªèãããã * @return ãªã½ã¼ã¹ååç½®è©ãç¡åããã±ã¼ã¸ã®å ´åã¯ç©ºæååãè¿ãã + * @see java.lang.ClassLoader#getResource * @see java.lang.Class#getResource */ - public static String getResourcePrefix(Package pkg){ + private static String getResourcePrefix(Package pkg){ if(pkg == null) return ""; // ç¡åããã±ã¼ã¸ String pkgName = pkg.getName(); String result = pkgName.replace(PKG_SEPCHAR, RES_SEPCHAR); - if(result.length() > 0){ + if( ! result.isEmpty() ){ result += RES_SEPARATOR; } + assert result.charAt(0) != RES_SEPCHAR; + return result; } @@ -124,6 +127,7 @@ public final class ResourceManager { * ãªã½ã¼ã¹åãç¨ãã¦ã * ããã©ã«ãã®ã¯ã©ã¹ãã¼ãã¨ããã©ã«ãã®ã«ã¼ãããã±ã¼ã¸ãã * ãªã½ã¼ã¹ã®URLãåå¾ããã + * * @param resPath ãªã½ã¼ã¹å * @return ãªã½ã¼ã¹ã®URLããªã½ã¼ã¹ãè¦ã¤ãããªããã°nullã */ @@ -134,35 +138,40 @@ public final class ResourceManager { /** * ä»»æã®ã«ã¼ãããã±ã¼ã¸ã¨ç¸å¯¾ãªã½ã¼ã¹åãç¨ãã¦ã * ããã©ã«ãã®ã¯ã©ã¹ãã¼ããããªã½ã¼ã¹ã®URLãåå¾ããã + * * @param rootPkg ã«ã¼ãããã±ã¼ã¸æå ±ã * ã/ãã§å§ã¾ãçµ¶å¯¾ãªã½ã¼ã¹åãæå®ãããå ´åã¯ç¡è¦ãããã * @param resPath ãªã½ã¼ã¹å * @return ãªã½ã¼ã¹ã®URLããªã½ã¼ã¹ãè¦ã¤ãããªããã°nullã */ - public static URL getResource(Package rootPkg, String resPath){ + private static URL getResource(Package rootPkg, String resPath){ return getResource(DEF_LOADER, rootPkg, resPath); } /** * ä»»æã®ã«ã¼ãããã±ã¼ã¸ã¨ç¸å¯¾ãªã½ã¼ã¹åãç¨ãã¦ã * ä»»æã®ã¯ã©ã¹ãã¼ããããªã½ã¼ã¹ã®URLãåå¾ããã + * * @param loader ã¯ã©ã¹ãã¼ã * @param rootPkg ã«ã¼ãããã±ã¼ã¸æå ±ã * ã/ãã§å§ã¾ãçµ¶å¯¾ãªã½ã¼ã¹åãæå®ãããå ´åã¯ç¡è¦ãããã * @param resPath ãªã½ã¼ã¹å * @return ãªã½ã¼ã¹ã®URLããªã½ã¼ã¹ãè¦ã¤ãããªããã°nullã */ - public static URL getResource(ClassLoader loader, - Package rootPkg, - String resPath ){ + private static URL getResource(ClassLoader loader, + Package rootPkg, + String resPath ){ String fullName; if(isAbsoluteResourcePath(resPath)){ - fullName = resPath.substring(1); // chop '/' heading + // chop '/' heading + fullName = resPath.substring(1); }else{ String pfx = getResourcePrefix(rootPkg); fullName = pfx + resPath; } + assert ! isAbsoluteResourcePath(fullName); + URL result = loader.getResource(fullName); return result; @@ -172,6 +181,7 @@ public final class ResourceManager { * ãªã½ã¼ã¹åãç¨ãã¦ã * ããã©ã«ãã®ã¯ã©ã¹ãã¼ãã¨ããã©ã«ãã®ã«ã¼ãããã±ã¼ã¸ãã * ãªã½ã¼ã¹ã®å¥åã¹ããªã¼ã ãåå¾ããã + * * @param resPath ãªã½ã¼ã¹å * @return ãªã½ã¼ã¹ã®å¥åã¹ããªã¼ã ããªã½ã¼ã¹ãè¦ã¤ãããªããã°nullã */ @@ -182,28 +192,30 @@ public final class ResourceManager { /** * ä»»æã®ã«ã¼ãããã±ã¼ã¸ã¨ç¸å¯¾ãªã½ã¼ã¹åãç¨ãã¦ã * ããã©ã«ãã®ã¯ã©ã¹ãã¼ããããªã½ã¼ã¹ã®å¥åã¹ããªã¼ã ãåå¾ããã + * * @param rootPkg ã«ã¼ãããã±ã¼ã¸æå ±ã * ã/ãã§å§ã¾ãçµ¶å¯¾ãªã½ã¼ã¹åãæå®ãããå ´åã¯ç¡è¦ãããã * @param resPath ãªã½ã¼ã¹å * @return ãªã½ã¼ã¹ã®å¥åã¹ããªã¼ã ããªã½ã¼ã¹ãè¦ã¤ãããªããã°nullã */ - public static InputStream getResourceAsStream(Package rootPkg, - String resPath ){ + private static InputStream getResourceAsStream(Package rootPkg, + String resPath ){ return getResourceAsStream(DEF_LOADER, rootPkg, resPath); } /** * ä»»æã®ã«ã¼ãããã±ã¼ã¸ã¨ç¸å¯¾ãªã½ã¼ã¹åãç¨ãã¦ã * ä»»æã®ã¯ã©ã¹ãã¼ããããªã½ã¼ã¹ã®å¥åã¹ããªã¼ã ãåå¾ããã + * * @param loader ã¯ã©ã¹ãã¼ã * @param rootPkg ã«ã¼ãããã±ã¼ã¸æå ±ã * ã/ãã§å§ã¾ãçµ¶å¯¾ãªã½ã¼ã¹åãæå®ãããå ´åã¯ç¡è¦ãããã * @param resPath ãªã½ã¼ã¹å * @return ãªã½ã¼ã¹ã®å¥åã¹ããªã¼ã ããªã½ã¼ã¹ãè¦ã¤ãããªããã°nullã */ - public static InputStream getResourceAsStream(ClassLoader loader, - Package rootPkg, - String resPath ){ + private static InputStream getResourceAsStream(ClassLoader loader, + Package rootPkg, + String resPath ){ URL url = getResource(loader, rootPkg, resPath); if(url == null) return null; @@ -219,6 +231,7 @@ public final class ResourceManager { /** * ãªã½ã¼ã¹åãç¨ãã¦ã¤ã¡ã¼ã¸ç»åãåå¾ããã + * * @param resPath ç»åãªã½ã¼ã¹å * @return ã¤ã¡ã¼ã¸ç»åããªã½ã¼ã¹ãè¦ã¤ãããªããã°nullã */ @@ -238,6 +251,7 @@ public final class ResourceManager { /** * ãªã½ã¼ã¹åãç¨ãã¦ã¢ã¤ã³ã³ç»åãåå¾ããã + * * @param resPath ã¢ã¤ã³ã³ç»åãªã½ã¼ã¹å * @return ã¢ã¤ã³ã³ç»åããªã½ã¼ã¹ãè¦ã¤ãããªããã°nullã */ @@ -276,24 +290,18 @@ public final class ResourceManager { /** * ãªã½ã¼ã¹åãç¨ãã¦ããããã£ãåå¾ããã + * * @param resPath ããããã£ãã¡ã¤ã«ã®ãªã½ã¼ã¹å * @return ããããã£ããªã½ã¼ã¹ãèªã¿è¾¼ããªããã°nullã */ public static Properties getProperties(String resPath){ InputStream is = getResourceAsStream(resPath); if(is == null) return null; - is = new BufferedInputStream(is); Properties properties = new Properties(); - try{ - properties.load(is); - }catch(IOException e){ - properties = null; - } - - try{ - is.close(); + try(InputStream pis = new BufferedInputStream(is)){ + properties.load(pis); }catch(IOException e){ properties = null; } @@ -310,31 +318,23 @@ public final class ResourceManager { * @return ããã¹ãããªã½ã¼ã¹ãèªã¿è¾¼ããªããã°nullã */ public static String getTextFile(String resPath){ - InputStream is = getResourceAsStream(resPath); + InputStream is; + is = getResourceAsStream(resPath); if(is == null) return null; is = new BufferedInputStream(is); Reader reader = new InputStreamReader(is, CS_UTF8); - reader = new BufferedReader(reader); - LineNumberReader lineReader = new LineNumberReader(reader); StringBuilder result = new StringBuilder(); - for(;;){ - String line; - try{ + try(LineNumberReader lineReader = new LineNumberReader(reader)){ + for(;;){ + String line; line = lineReader.readLine(); - }catch(IOException e){ - result = null; - break; + if(line == null) break; + if(line.startsWith("#")) continue; + result.append(line).append('\n'); } - if(line == null) break; - if(line.startsWith("#")) continue; - result.append(line).append('\n'); - } - - try{ - lineReader.close(); }catch(IOException e){ result = null; } diff --git a/src/main/java/jp/sfjp/jindolf/config/AppSetting.java b/src/main/java/jp/sfjp/jindolf/config/AppSetting.java index 373d209..8ffab6d 100644 --- a/src/main/java/jp/sfjp/jindolf/config/AppSetting.java +++ b/src/main/java/jp/sfjp/jindolf/config/AppSetting.java @@ -9,14 +9,29 @@ package jp.sfjp.jindolf.config; import java.awt.Font; import java.awt.Rectangle; +import java.awt.image.BufferedImage; import java.io.File; +import java.io.IOException; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.text.MessageFormat; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.logging.Logger; +import javax.imageio.ImageIO; +import jp.sfjp.jindolf.data.Avatar; import jp.sfjp.jindolf.data.DialogPref; import jp.sfjp.jindolf.glyph.Font2Json; import jp.sfjp.jindolf.glyph.FontInfo; import jp.sfjp.jindolf.net.ProxyInfo; +import jp.sfjp.jindolf.view.AvatarPics; +import jp.sfjp.jindolf.view.LocalAvatarImg; import jp.sourceforge.jovsonz.JsBoolean; import jp.sourceforge.jovsonz.JsObject; import jp.sourceforge.jovsonz.JsPair; +import jp.sourceforge.jovsonz.JsString; +import jp.sourceforge.jovsonz.JsTypes; import jp.sourceforge.jovsonz.JsValue; /** @@ -35,6 +50,12 @@ public class AppSetting{ private static final String HASH_ALIGNBALOON = "alignBaloonWidth"; private static final String HASH_PROXY = "proxy"; + private static final String MSG_NOIMG = + "ç»åãã¡ã¤ã«{0}ãèªã¿è¾¼ããªããã" + + "{1}ã®è¡¨ç¤ºã«ä»£æ¿ã¤ã¡ã¼ã¸ãä½¿ãã¾ãã"; + + private static final Logger LOGGER = Logger.getAnonymousLogger(); + private final OptionInfo optInfo; private final ConfigStore configStore; @@ -49,6 +70,10 @@ public class AppSetting{ private JsValue loadedNetConfig; private JsValue loadedTalkConfig; + private final Map avatarFaceMap = new HashMap<>(); + private final Map avatarBodyMap = new HashMap<>(); + + /** * ã³ã³ã¹ãã©ã¯ã¿ã * @param info ã³ãã³ãã©ã¤ã³å¼æ° @@ -334,6 +359,116 @@ public class AppSetting{ } /** + * JSONããã¼ã¹ãAvatar-Imageéãããã«åæ ãããã + * + * @param json JSONæ§é + * @param map ããã + */ + private void parseImgMap(JsObject json, Map map){ + Path imgDir = this.configStore.getLocalImgDir(); + + List pairList = json.getPairList(); + for(JsPair pair : pairList){ + String avatarId = pair.getName(); + JsValue value = pair.getValue(); + + if(value.getJsTypes() != JsTypes.STRING) continue; + JsString sVal = (JsString)value; + String imgName = sVal.toRawString(); + + Path imgPath = Paths.get(imgName); + Path full = imgDir.resolve(imgPath); + File file = full.toFile(); + if( ! file.isAbsolute() + || ! file.exists() + || ! file.isFile() + || ! file.canRead() ){ + String msg = MessageFormat.format( + MSG_NOIMG, file.getPath(), avatarId + ); + LOGGER.info(msg); + continue; + } + + BufferedImage image; + try { + image = ImageIO.read(file); + }catch(IOException e){ + String msg = MessageFormat.format( + MSG_NOIMG, file.getPath(), avatarId + ); + LOGGER.info(msg); + continue; + } + + map.put(avatarId, image); + } + + return; + } + + /** + * ãã¼ã«ã«ç»åè¨å®ããã¼ãããã + */ + private void loadLocalImageConfig(){ + JsObject root = this.configStore.loadLocalImgConfig(); + if(root == null) return; + + JsValue faceConfig = root.getValue("avatarFace"); + JsValue bodyConfig = root.getValue("avatarBody"); + if(faceConfig.getJsTypes() != JsTypes.OBJECT) return; + if(bodyConfig.getJsTypes() != JsTypes.OBJECT) return; + + JsObject jsonFace = (JsObject) faceConfig; + parseImgMap(jsonFace, this.avatarFaceMap); + + + JsObject jsonBody = (JsObject) bodyConfig; + parseImgMap(jsonBody, this.avatarBodyMap); + + return; + } + + /** + * ãã¼ã«ã«ä»£æ¿ã¤ã¡ã¼ã¸ãç»åãã£ãã·ã¥ã«åæ ãããã + * + * @param avatarPics ç»åãã£ãã·ã¥ + */ + public void applyLocalImage(AvatarPics avatarPics){ + BufferedImage graveImage = this.avatarFaceMap.get("tomb"); + BufferedImage graveBodyImage = this.avatarBodyMap.get("tomb"); + + if(graveImage == null){ + graveImage = LocalAvatarImg.getGraveImage(); + } + if(graveBodyImage == null){ + graveBodyImage = LocalAvatarImg.getGraveBodyImage(); + } + + avatarPics.setGraveImage(graveImage); + avatarPics.setGraveBodyImage(graveBodyImage); + + for(Avatar avatar : Avatar.getPredefinedAvatarList()){ + String avatarId = avatar.getIdentifier(); + + BufferedImage faceImage = this.avatarFaceMap.get(avatarId); + BufferedImage bodyImage = this.avatarBodyMap.get(avatarId); + + if(faceImage == null){ + faceImage = LocalAvatarImg.getAvatarFaceImage(avatarId); + } + if(bodyImage == null){ + bodyImage = LocalAvatarImg.getAvatarBodyImage(avatarId); + } + + avatarPics.setAvatarFaceImage(avatar, faceImage); + avatarPics.setAvatarBodyImage(avatar, bodyImage); + } + + return; + } + + /** * ãããã¯ã¼ã¯è¨å®ãã»ã¼ãããã */ private void saveNetConfig(){ @@ -392,6 +527,7 @@ public class AppSetting{ public void loadConfig(){ loadNetConfig(); loadTalkConfig(); + loadLocalImageConfig(); return; } diff --git a/src/main/java/jp/sfjp/jindolf/config/ConfigFile.java b/src/main/java/jp/sfjp/jindolf/config/ConfigFile.java index fe92f87..35efc47 100644 --- a/src/main/java/jp/sfjp/jindolf/config/ConfigFile.java +++ b/src/main/java/jp/sfjp/jindolf/config/ConfigFile.java @@ -10,13 +10,19 @@ package jp.sfjp.jindolf.config; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; +import java.io.InputStream; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.PrintWriter; import java.io.Writer; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; import javax.swing.JDialog; import javax.swing.JOptionPane; +import jp.sfjp.jindolf.ResourceManager; import jp.sfjp.jindolf.VerInfo; import jp.sfjp.jindolf.view.LockErrorPane; @@ -31,7 +37,7 @@ public final class ConfigFile{ private static final String JINCONF = "Jindolf"; private static final String JINCONF_DOT = ".jindolf"; private static final String FILE_README = "README.txt"; - private static final Charset CHARSET_README = Charset.forName("UTF-8"); + private static final Charset CHARSET_README = StandardCharsets.UTF_8; private static final String MSG_POST = "

èµ·ååJARãã¡ã¤ã«ã¨åããã£ã¬ã¯ããªã«ã * ã¢ã¯ã»ã¹å¯è½ãªãã£ã¬ã¯ããª"Jindolf"ã * ãã§ã«åå¨ãã¦ããã°ãããè¿ãã - * èµ·ååJARãã¡ã¤ã«ããã³"Jindolf"ãçºè¦ã§ããªããã°ã + * + *
èµ·ååJARãã¡ã¤ã«ããã³"Jindolf"ãçºè¦ã§ããªããã°ã * MacOSXç°å¢ã®å ´å"~/Library/Application Support/Jindolf/"ãè¿ãã * Windowsç°å¢ã®å ´å"%USERPROFILE%\Jindolf\"ãè¿ãã - * ããä»¥å¤ã®ç°å¢(Linux,etc?)ã®å ´å"~/.jindolf/"ãè¿ãã - * è¿ããã£ã¬ã¯ããªãåå¨ãã¦ãããå¦ãã + * + *
ããä»¥å¤ã®ç°å¢(Linux,etc?)ã®å ´å"~/.jindolf/"ãè¿ãã + * + *

è¿ããã£ã¬ã¯ããªãåå¨ãã¦ãããå¦ãã * ã¢ã¯ã»ã¹å¯è½ãå¦ãã¯å¼ã³åºãåã§å¤æããã + * * @return è¨å®æ ¼ç´ãã£ã¬ã¯ããª */ public static File getImplicitConfigDirectory(){ @@ -91,14 +106,16 @@ public final class ConfigFile{ /** * ã¾ã åå¨ããªãè¨å®æ ¼ç´ãã£ã¬ã¯ããªãæ°è¦ã«ä½æããã - * ã¨ã©ã¼ãããã°ãã¤ã¢ãã°æç¤ºã¨ã¨ãã«VMçµäºããã + * + *

ã¨ã©ã¼ãããã°ãã¤ã¢ãã°æç¤ºã¨ã¨ãã«VMçµäºããã + * * @param confPath è¨å®æ ¼ç´ãã£ã¬ã¯ããª * @param isImplicitPath ãã£ã¬ã¯ããªãæé»çã«æå®ããããã®ãªãtrueã * @return æ°è¦ã«ä½æããè¨å®æ ¼ç´ãã£ã¬ã¯ããª * @throws IllegalArgumentException ãã§ã«ãã®ãã£ã¬ã¯ããªã¯åå¨ããã */ public static File buildConfigDirectory(File confPath, - boolean isImplicitPath ) + boolean isImplicitPath ) throws IllegalArgumentException{ if(confPath.exists()) throw new IllegalArgumentException(); @@ -154,9 +171,41 @@ public final class ConfigFile{ } /** + * ãã¼ã«ã«ç»åãã£ãã·ã¥ãã£ã¬ã¯ããªãä½ãã + * + *

ä½ããããã£ã¬ã¯ããªåã« + * ãã¡ã¤ã«avatarCache.jsonãä½ãããã + * + * @param imgCacheDir ãã¼ã«ã«ç»åãã£ãã·ã¥ãã£ã¬ã¯ããª + */ + public static void buildImageCacheDir(File imgCacheDir){ + if(imgCacheDir.exists()) return; + + String jsonRes = "resources/image/avatarCache.json"; + InputStream is = ResourceManager.getResourceAsStream(jsonRes); + if(is == null) return; + + imgCacheDir.mkdirs(); + ConfigFile.checkAccessibility(imgCacheDir); + + Path cachePath = imgCacheDir.toPath(); + Path jsonLeaf = Paths.get("avatarCache.json"); + Path path = cachePath.resolve(jsonLeaf); + try{ + Files.copy(is, path); + }catch(IOException e){ + abortCantAccessConfigDir(path.toFile()); + } + + return; + } + + /** * è¨å®ãã£ã¬ã¯ããªæä½ã® * å±éã¨ã©ã¼ã¡ãã»ã¼ã¸ç¢ºèªãã¤ã¢ãã°ãè¡¨ç¤ºããã - * éããã¾ã§å¾ã¤ã + * + *

éããã¾ã§å¾ã¤ã + * * @param seq ã¡ãã»ã¼ã¸ */ private static void showErrorMessage(CharSequence seq){ @@ -170,7 +219,9 @@ public final class ConfigFile{ /** * è¨å®ãã£ã¬ã¯ããªæä½ã® * å±éã¨ã©ã¼ã¡ãã»ã¼ã¸ç¢ºèªãã¤ã¢ãã°ãè¡¨ç¤ºããã - * éããã¾ã§å¾ã¤ã + * + *

éããã¾ã§å¾ã¤ã + * * @param seq ã¡ãã»ã¼ã¸ */ private static void showWarnMessage(CharSequence seq){ @@ -184,7 +235,9 @@ public final class ConfigFile{ /** * è¨å®ãã£ã¬ã¯ããªæä½ã® * æå ±æç¤ºã¡ãã»ã¼ã¸ç¢ºèªãã¤ã¢ãã°ãè¡¨ç¤ºããã - * éããã¾ã§å¾ã¤ã + * + *

éããã¾ã§å¾ã¤ã + * * @param seq ã¡ãã»ã¼ã¸ */ private static void showInfoMessage(CharSequence seq){ @@ -197,6 +250,7 @@ public final class ConfigFile{ /** * ãã¤ã¢ãã°ãè¡¨ç¤ºããéããããã¾ã§å¾ã¤ã + * * @param pane ãã¤ã¢ãã°ã®åã¨ãªããã¤ã³ */ private static void showDialog(JOptionPane pane){ @@ -222,6 +276,7 @@ public final class ConfigFile{ /** * è¨å®ãã£ã¬ã¯ããªã®ã«ã¼ããã¡ã¤ã«ã·ã¹ãã ãããã¯ãã©ã¤ãã¬ã¿ã¼ã« * ã¢ã¯ã»ã¹ã§ããªãã¨ã©ã¼ããã¤ã¢ãã°ã«æç¤ºããVMçµäºããã + * * @param path è¨å®ãã£ã¬ã¯ããª * @param preMessage ã¡ãã»ã¼ã¸åå */ @@ -242,6 +297,7 @@ public final class ConfigFile{ /** * è¨å®ãã£ã¬ã¯ããªã®ç¥åã«æ¸ãè¾¼ããªãã¨ã©ã¼ããã¤ã¢ãã°ã§æç¤ºãã * VMçµäºããã + * * @param existsAncestor åå¨ãããã£ã¨ãè¿ãç¥å * @param preMessage ã¡ãã»ã¼ã¸åå */ @@ -262,6 +318,7 @@ public final class ConfigFile{ /** * è¨å®ãã£ã¬ã¯ããªãæ°è¦ã«çæãã¦ããããã¤ã¢ãã°ã§åãåãããã + * * @param existsAncestor åå¨ãããã£ã¨ãè¿ãç¥å * @param preMessage ã¡ãã»ã¼ã¸åå * @return çæãã¦ããã¨æç¤ºãããã°true @@ -312,6 +369,7 @@ public final class ConfigFile{ /** * è¨å®ãã£ã¬ã¯ããªãçæã§ããªãã¨ã©ã¼ããã¤ã¢ãã°ã§æç¤ºãã * VMçµäºããã + * * @param path çæã§ããªãã£ããã£ã¬ã¯ããª */ private static void abortCantBuildConfigDir(File path){ @@ -330,6 +388,7 @@ public final class ConfigFile{ /** * è¨å®ãã£ã¬ã¯ããªã¸ã¢ã¯ã»ã¹ã§ããªãã¨ã©ã¼ããã¤ã¢ãã°ã§æç¤ºãã * VMçµäºããã + * * @param path ã¢ã¯ã»ã¹ã§ããªããã£ã¬ã¯ããª */ private static void abortCantAccessConfigDir(File path){ @@ -349,6 +408,7 @@ public final class ConfigFile{ /** * ãã¡ã¤ã«ã«æ¸ãè¾¼ããªãã¨ã©ã¼ããã¤ã¢ãã°ã§æç¤ºããVMçµäºããã + * * @param file æ¸ãè¾¼ããªãã£ããã¡ã¤ã« */ private static void abortCantWrite(File file){ @@ -365,7 +425,9 @@ public final class ConfigFile{ /** * æå®ããããã£ã¬ã¯ããªã«READMEãã¡ã¤ã«ãçæããã - * çæã§ããªããã°ãã¤ã¢ãã°è¡¨ç¤ºã¨ã¨ãã«VMçµäºããã + * + *

çæã§ããªããã°ãã¤ã¢ãã°è¡¨ç¤ºã¨ã¨ãã«VMçµäºããã + * * @param path READMEã®æ ¼ç´ãã£ã¬ã¯ããª */ private static void touchReadme(File path){ @@ -413,6 +475,7 @@ public final class ConfigFile{ /** * è¨å®ãã£ã¬ã¯ããªãã¢ã¯ã»ã¹å¯è½ã§ãªããã° * ã¨ã©ã¼ãã¤ã¢ãã°ãåºãã¦VMçµäºããã + * * @param confDir è¨å®ãã£ã¬ã¯ããª */ public static void checkAccessibility(File confDir){ @@ -425,6 +488,7 @@ public final class ConfigFile{ /** * ã»ã³ã¿ãªã³ã°ããããã¡ã¤ã«åè¡¨ç¤ºã®HTMLè¡¨è¨ãåºåããã + * * @param path ãã¡ã¤ã« * @return HTMLè¡¨è¨ */ @@ -437,10 +501,13 @@ public final class ConfigFile{ /** * ããã¯ã¨ã©ã¼ãã¤ã¢ãã°ã®è¡¨ç¤ºã - * å¼ã³åºãããæ»ã£ã¦ãã¾ã ããã¯ãªãã¸ã§ã¯ãã + * + *

ããã¯ãã¡ã¤ã«ã®å¼·å¶è§£é¤ã«å¤±æããå ´åã¯VMçµäºããã + * * @param lock ã¨ã©ã¼ãèµ·ãããããã¯ */ public static void confirmLockError(InterVMLock lock){ diff --git a/src/main/java/jp/sfjp/jindolf/config/ConfigStore.java b/src/main/java/jp/sfjp/jindolf/config/ConfigStore.java index 28b3e9c..720c5e6 100644 --- a/src/main/java/jp/sfjp/jindolf/config/ConfigStore.java +++ b/src/main/java/jp/sfjp/jindolf/config/ConfigStore.java @@ -23,6 +23,9 @@ import java.io.OutputStreamWriter; import java.io.Reader; import java.io.Writer; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; +import java.nio.file.Path; +import java.nio.file.Paths; import java.util.logging.Level; import java.util.logging.Logger; import jp.sourceforge.jovsonz.JsComposition; @@ -39,60 +42,51 @@ public class ConfigStore { /** æ¤ç´¢å±¥æ´ãã¡ã¤ã«ã */ public static final File HIST_FILE = new File("searchHistory.json"); - /** åç¨¿ãã¡ã¤ã«ã */ - public static final File DRAFT_FILE = new File("draft.json"); /** ãããã¯ã¼ã¯è¨å®ãã¡ã¤ã«ã */ public static final File NETCONFIG_FILE = new File("netconfig.json"); /** å°è©è¡¨ç¤ºè¨å®ãã¡ã¤ã«ã */ public static final File TALKCONFIG_FILE = new File("talkconfig.json"); + /** ãã¼ã«ã«ç»åæ ¼ç´ãã£ã¬ã¯ããªã */ + public static final Path LOCALIMG_DIR = Paths.get("img"); + /** ãã¼ã«ã«ç»åè¨å®ãã¡ã¤ã«ã */ + public static final Path LOCALIMGCONFIG_PATH = + Paths.get("avatarCache.json"); private static final String LOCKFILE = "lock"; - private static final Charset CHARSET_JSON = Charset.forName("UTF-8"); + private static final Charset CHARSET_JSON = StandardCharsets.UTF_8; private static final Logger LOGGER = Logger.getAnonymousLogger(); private boolean useStoreFile; private boolean isImplicitPath; - private File configPath; + private File configDir; /** * ã³ã³ã¹ãã©ã¯ã¿ã - * @param useStoreFile è¨å®ãã£ã¬ã¯ããªã¸ã®æ°¸ç¶åæ©è½ãä½¿ããªãtrue - * @param configPath è¨å®ãã£ã¬ã¯ããªã - * è¨å®ãã£ã¬ã¯ããªãä½¿ããªãå ´åã¯ç¡è¦ãããnullã¨ãã¦æ±ãããã - */ - public ConfigStore(boolean useStoreFile, File configPath ){ - this(useStoreFile, true, configPath); - return; - } - - /** - * ã³ã³ã¹ãã©ã¯ã¿ã - * @param useStoreFile è¨å®ãã£ã¬ã¯ããªã¸ã®æ°¸ç¶åæ©è½ãä½¿ããªãtrue - * @param isImplicitPath ã³ãã³ãã©ã¤ã³ã§æå®ããããã£ã¬ã¯ããªãªãfalse - * @param configPath è¨å®ãã£ã¬ã¯ããªã - * è¨å®ãã£ã¬ã¯ããªãä½¿ããªãå ´åã¯ç¡è¦ãããnullã¨ãã¦æ±ãããã + * + * @param useStoreFile è¨å®ãã£ã¬ã¯ããªåã¸ã® + * ã»ã¼ããã¼ã¿æ©è½ãä½¿ããªãtrue + * @param isImplicitPath èµ·åã³ãã³ãã©ã¤ã³ããæå®ããã + * è¨å®ãã£ã¬ã¯ããªã®å ´åfalse + * @param configDirPath è¨å®ãã£ã¬ã¯ããªã + * è¨å®ãã£ã¬ã¯ããªãä½¿ããªãå ´åã¯ç¡è¦ãããã */ public ConfigStore(boolean useStoreFile, - boolean isImplicitPath, - File configPath ){ + boolean isImplicitPath, + File configDirPath ){ super(); this.useStoreFile = useStoreFile; if(this.useStoreFile){ this.isImplicitPath = isImplicitPath; + this.configDir = configDirPath; }else{ this.isImplicitPath = true; - } - - if(this.useStoreFile){ - this.configPath = configPath; - }else{ - this.configPath = null; + this.configDir = null; } return; @@ -101,6 +95,7 @@ public class ConfigStore { /** * è¨å®ãã£ã¬ã¯ããªãä½¿ããå¦ãå¤å®ããã + * * @return è¨å®ãã£ã¬ã¯ããªãä½¿ããªãtrueã */ public boolean useStoreFile(){ @@ -109,12 +104,24 @@ public class ConfigStore { /** * è¨å®ãã£ã¬ã¯ããªãè¿ãã + * * @return è¨å®ãã£ã¬ã¯ããªãè¨å®ãã£ã¬ã¯ããªãä½¿ããªãå ´åã¯null */ - public File getConfigPath(){ - File result; - if(this.useStoreFile) result = this.configPath; - else result = null; + public File getConfigDir(){ + return this.configDir; + } + + /** + * ãã¼ã«ã«ç»åæ ¼ç´ãã£ã¬ã¯ããªãè¿ãã + * + * @return æ ¼ç´ãã£ã¬ã¯ããªãæ ¼ç´ãã£ã¬ã¯ããªãä½¿ããªãå ´åã¯null + */ + public Path getLocalImgDir(){ + if(this.configDir == null) return null; + + Path configPath = this.configDir.toPath(); + Path result = configPath.resolve(LOCALIMG_DIR); + return result; } @@ -126,13 +133,18 @@ public class ConfigStore { public void prepareConfigDir(){ if( ! this.useStoreFile ) return; - if( ! this.configPath.exists() ){ + if( ! this.configDir.exists() ){ File created = - ConfigFile.buildConfigDirectory(this.configPath, + ConfigFile.buildConfigDirectory(this.configDir, this.isImplicitPath ); ConfigFile.checkAccessibility(created); }else{ - ConfigFile.checkAccessibility(this.configPath); + ConfigFile.checkAccessibility(this.configDir); + } + + File imgDir = new File(this.configDir, "img"); + if( ! imgDir.exists()){ + ConfigFile.buildImageCacheDir(imgDir); } return; @@ -140,11 +152,14 @@ public class ConfigStore { /** * ããã¯ãã¡ã¤ã«ã®åå¾ãè©¦ã¿ãã + * + *

ããã¯ã«å¤±æãããå¦çãç¶è¡ããå ´åã + * è¨å®ãã£ã¬ã¯ããªã¯ä½¿ããªããã®ã¨ãã¦ç¶è¡ããã */ public void tryLock(){ if( ! this.useStoreFile ) return; - File lockFile = new File(this.configPath, LOCKFILE); + File lockFile = new File(this.configDir, LOCKFILE); InterVMLock lock = new InterVMLock(lockFile); lock.tryLock(); @@ -153,7 +168,8 @@ public class ConfigStore { ConfigFile.confirmLockError(lock); if( ! lock.isFileOwner() ){ this.useStoreFile = false; - this.configPath = null; + this.isImplicitPath = true; + this.configDir = null; } } @@ -162,6 +178,7 @@ public class ConfigStore { /** * è¨å®ãã£ã¬ã¯ããªä¸ã®OBJECTåJSONãã¡ã¤ã«ãèªã¿è¾¼ãã + * * @param file JSONãã¡ã¤ã«ã®ç¸å¯¾ãã¹ã * @return JSON objectã * è¨å®ãã£ã¬ã¯ããªãä½¿ããªãè¨å®ã @@ -178,6 +195,7 @@ public class ConfigStore { /** * è¨å®ãã£ã¬ã¯ããªä¸ã®JSONãã¡ã¤ã«ãèªã¿è¾¼ãã + * * @param file JSONãã¡ã¤ã«ã®ç¸å¯¾ãã¹ * @return JSON objectã¾ãã¯arrayã * è¨å®ãã£ã¬ã¯ããªãä½¿ããªãè¨å®ã @@ -191,8 +209,8 @@ public class ConfigStore { if(file.isAbsolute()){ absFile = file; }else{ - if(this.configPath == null) return null; - absFile = new File(this.configPath, file.getPath()); + if(this.configDir == null) return null; + absFile = new File(this.configDir, file.getPath()); if( ! absFile.exists() ) return null; if( ! absFile.isAbsolute() ) return null; } @@ -257,6 +275,7 @@ public class ConfigStore { /** * æåã¹ããªã¼ã ä¸ã®JSONãã¼ã¿ãèªã¿è¾¼ãã + * * @param reader æåã¹ããªã¼ã * @return JSON objectã¾ãã¯arrayã * @throws IOException å¥åã¨ã©ã¼ @@ -270,6 +289,7 @@ public class ConfigStore { /** * è¨å®ãã£ã¬ã¯ããªä¸ã®JSONãã¡ã¤ã«ã«æ¸ãè¾¼ãã + * * @param file JSONãã¡ã¤ã«ã®ç¸å¯¾ãã¹ * @param root JSON objectã¾ãã¯array * @return æ£ããã»ã¼ããè¡ãããã°trueã @@ -279,7 +299,7 @@ public class ConfigStore { if( ! this.useStoreFile ) return false; // TODO ãã³ãã©ãªãã¡ã¤ã«ãç¨ããããå®å¨ãªãã¡ã¤ã«æ´æ° - File absFile = new File(this.configPath, file.getPath()); + File absFile = new File(this.configDir, file.getPath()); String absPath = absFile.getPath(); absFile.delete(); @@ -351,6 +371,7 @@ public class ConfigStore { /** * æåã¹ããªã¼ã ã«JSONãã¼ã¿ãæ¸ãè¾¼ãã + * * @param writer æåã¹ããªã¼ã åºå * @param root JSON objectã¾ãã¯array * @throws IOException åºåã¨ã©ã¼ @@ -364,6 +385,7 @@ public class ConfigStore { /** * æ¤ç´¢å±¥æ´ãã¡ã¤ã«ãèªã¿è¾¼ãã + * * @return å±¥æ´ãã¼ã¿ãå±¥æ´ãèªã¾ãªããããã¯èªããªãå ´åã¯null */ public JsObject loadHistoryConfig(){ @@ -372,16 +394,8 @@ public class ConfigStore { } /** - * åç¨¿ãã¡ã¤ã«ãèªã¿è¾¼ãã - * @return åç¨¿ãã¼ã¿ãåç¨¿ãèªã¾ãªããããã¯èªããªãå ´åã¯null - */ - public JsObject loadDraftConfig(){ - JsObject result = loadJsObject(DRAFT_FILE); - return result; - } - - /** * ãããã¯ã¼ã¯è¨å®ãã¡ã¤ã«ãèªã¿è¾¼ãã + * * @return ãããã¯ã¼ã¯è¨å®ãã¼ã¿ã * è¨å®ãèªã¾ãªããããã¯èªããªãå ´åã¯null */ @@ -392,6 +406,7 @@ public class ConfigStore { /** * å°è©è¡¨ç¤ºè¨å®ãã¡ã¤ã«ãèªã¿è¾¼ãã + * * @return å°è©è¡¨ç¤ºè¨å®ãã¼ã¿ã * è¨å®ãèªã¾ãªããããã¯èªããªãå ´åã¯null */ @@ -401,27 +416,31 @@ public class ConfigStore { } /** - * æ¤ç´¢å±¥æ´ãã¡ã¤ã«ã«æ¸ãè¾¼ãã - * @param root å±¥æ´ãã¼ã¿ - * @return æ¸ãè¾¼ã¾ãªãã£ããããã¯æ¸ãè¾¼ããªãã£ãå ´åã¯false + * ãã¼ã«ã«ç»åè¨å®ãã¡ã¤ã«ãèªã¿è¾¼ãã + * + * @return ãã¼ã«ã«ç»åè¨å®ãã¼ã¿ã + * è¨å®ãèªã¾ãªããããã¯èªããªãå ´åã¯null */ - public boolean saveHistoryConfig(JsComposition root){ - boolean result = saveJson(HIST_FILE, root); + public JsObject loadLocalImgConfig(){ + Path path = LOCALIMG_DIR.resolve(LOCALIMGCONFIG_PATH); + JsObject result = loadJsObject(path.toFile()); return result; } /** - * åç¨¿ãã¡ã¤ã«ã«æ¸ãè¾¼ãã - * @param root åç¨¿ãã¼ã¿ + * æ¤ç´¢å±¥æ´ãã¡ã¤ã«ã«æ¸ãè¾¼ãã + * + * @param root å±¥æ´ãã¼ã¿ * @return æ¸ãè¾¼ã¾ãªãã£ããããã¯æ¸ãè¾¼ããªãã£ãå ´åã¯false */ - public boolean saveDraftConfig(JsComposition root){ - boolean result = saveJson(DRAFT_FILE, root); + public boolean saveHistoryConfig(JsComposition root){ + boolean result = saveJson(HIST_FILE, root); return result; } /** * ãããã¯ã¼ã¯è¨å®ãã¡ã¤ã«ã«æ¸ãè¾¼ãã + * * @param root ãããã¯ã¼ã¯è¨å® * @return æ¸ãè¾¼ã¾ãªãã£ããããã¯æ¸ãè¾¼ããªãã£ãå ´åã¯false */ @@ -432,6 +451,7 @@ public class ConfigStore { /** * å°è©è¡¨ç¤ºè¨å®ãã¡ã¤ã«ã«æ¸ãè¾¼ãã + * * @param root å°è©è¡¨ç¤ºè¨å® * @return æ¸ãè¾¼ã¾ãªãã£ããããã¯æ¸ãè¾¼ããªãã£ãå ´åã¯false */ diff --git a/src/main/java/jp/sfjp/jindolf/data/Anchor.java b/src/main/java/jp/sfjp/jindolf/data/Anchor.java index 7eb1b9b..4bbb20d 100644 --- a/src/main/java/jp/sfjp/jindolf/data/Anchor.java +++ b/src/main/java/jp/sfjp/jindolf/data/Anchor.java @@ -11,7 +11,6 @@ import java.util.LinkedList; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import jp.sfjp.jindolf.util.StringUtils; /** * çºè¨ã¢ã³ã«ã¼ã @@ -186,7 +185,7 @@ public final class Anchor{ /* Gå½ã¢ã³ã«ã¼ */ if(matcher.start(14) < matcher.end(14)){ - int talkNo = StringUtils.parseInt(source, matcher, 14); + int talkNo = parseInt(source, matcher, 14); Anchor anchor = new Anchor(source, startPos, endPos, talkNo); return anchor; } @@ -198,7 +197,7 @@ public final class Anchor{ }else if(matcher.start(3) < matcher.end(3)){ // epilogue day = EPILOGUEDAY; }else if(matcher.start(4) < matcher.end(4)){ // etc) "6d" - day = StringUtils.parseInt(source, matcher, 4); + day = parseInt(source, matcher, 4); }else{ assert false; return null; @@ -229,8 +228,8 @@ public final class Anchor{ assert false; return null; } - int hour = StringUtils.parseInt(source, matcher, hourGroup); - int minute = StringUtils.parseInt(source, matcher, minuteGroup); + int hour = parseInt(source, matcher, hourGroup); + int minute = parseInt(source, matcher, minuteGroup); if(isPM && hour < 12) hour += 12; hour %= 24; @@ -246,6 +245,49 @@ public final class Anchor{ } /** + * æ£è¦è¡¨ç¾ã«ãããããé åãæ°å¤åããã + * + * @param seq æåå + * @param matcher Matcher + * @param groupIndex åæ¹æå®ã°ã«ã¼ãçªå· + * @return æ°å¤ + * @throws IndexOutOfBoundsException ä¸æ£ãªã°ã«ã¼ãçªå· + */ + static int parseInt(CharSequence seq, + Matcher matcher, + int groupIndex ) + throws IndexOutOfBoundsException { + int startPos = matcher.start(groupIndex); + int endPos = matcher.end(groupIndex); + return parseInt(seq, startPos, endPos); + } + + /** + * é¨åæååãæ°å¤åããã + * + * @param seq æåå + * @param startPos ç¯å²éå§ä½ç½® + * @param endPos ç¯å²çµäºä½ç½® + * @return ãã¼ã¹ããæ°å¤ + * @throws IndexOutOfBoundsException ä¸æ£ãªä½ç½®æå® + */ + static int parseInt(CharSequence seq, int startPos, int endPos) + throws IndexOutOfBoundsException{ + int result = 0; + + for(int pos = startPos; pos < endPos; pos++){ + char ch = seq.charAt(pos); + int digit = Character.digit(ch, 10); + if(digit < 0) break; + result *= 10; + result += digit; + } + + return result; + } + + + /** * ã¢ã³ã«ã¼ã®å«ã¾ããæååãè¿ãã * @return ã¢ã³ã«ã¼ã®å«ã¾ããæåå */ diff --git a/src/main/java/jp/sfjp/jindolf/data/Avatar.java b/src/main/java/jp/sfjp/jindolf/data/Avatar.java index 4925e09..7b17f9d 100644 --- a/src/main/java/jp/sfjp/jindolf/data/Avatar.java +++ b/src/main/java/jp/sfjp/jindolf/data/Avatar.java @@ -7,69 +7,50 @@ package jp.sfjp.jindolf.data; -import java.io.IOException; -import java.net.URISyntaxException; -import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.RandomAccess; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.ParserConfigurationException; -import jp.sfjp.jindolf.dxchg.XmlUtils; +import java.util.stream.Collectors; import jp.sourceforge.jindolf.corelib.PreDefAvatar; -import org.xml.sax.SAXException; /** * Avatar ã¾ãã®åããã£ã©ã¯ã¿ã¼ã + * + *

ã²ã«ããAvatarã§ããã + * å¢ç³ã¯ãAvatarã®ç¶æãã§ãã£ã¦Avatarãã®ãã®ã§ã¯ãªãã + * + *

ãããã¼ã°ãçµããåå ãã¬ã¤ã¤ã¼ãåºå®ãããã¾ã§ã®éã + * è¤æ°ã®ãã¬ã¤ã¤ã¼ãåä¸Avatarãæå½ãããã + * + *

Avataråå£«ã¯éãçªå·ã«ããä¸æã«é åºã¥ããããã + * + *

è¨è¨ã¡ã¢: æªç¥ã®Avataråºç¾ã«åãã + * {@link PreDefAvatar}ã¨åé¢ããã¯ã©ã¹ã¨ãã¦è¨è¨ãããã + * + *

2020-03ç¾å¨ãAvatarã¯20ã¤ã³ã¹ã¿ã³ã¹ã§åºå®ã + * Zå½å«ãæªç¥ã®Avatarãè¿½å ãããã±ã¼ã¹ã¯ä»å¾èæ®ããªãã */ public class Avatar implements Comparable { /** ã²ã«ãã */ public static final Avatar AVATAR_GERD; - private static final List AVATAR_LIST; - private static final Map AVATAR_MAP; + private static final List AVATAR_LIST = buildAvatarList(); + private static final Map AVATAR_FN_MAP = new HashMap<>(); + private static final Map AVATAR_ID_MAP = new HashMap<>(); - private static final Pattern AVATAR_PATTERN; static{ - List predefs; - try{ - DocumentBuilder builder = XmlUtils.createDocumentBuilder(); - predefs = PreDefAvatar.buildPreDefAvatarList(builder); - }catch( IOException - | ParserConfigurationException - | SAXException - | URISyntaxException - e){ - throw new ExceptionInInitializerError(e); - } - - AVATAR_LIST = buildAvatarList(predefs); - - AVATAR_MAP = new HashMap<>(); - for(Avatar avatar : AVATAR_LIST){ + AVATAR_LIST.forEach(avatar -> { String fullName = avatar.getFullName(); - AVATAR_MAP.put(fullName, avatar); - } + String avatarId = avatar.getIdentifier(); + AVATAR_FN_MAP.put(fullName, avatar); + AVATAR_ID_MAP.put(avatarId, avatar); + }); - StringBuilder avatarGroupRegex = new StringBuilder(); - for(Avatar avatar : AVATAR_LIST){ - String fullName = avatar.getFullName(); - if(avatarGroupRegex.length() > 0){ - avatarGroupRegex.append('|'); - } - avatarGroupRegex.append('(') - .append(Pattern.quote(fullName)) - .append(')'); - } - AVATAR_PATTERN = Pattern.compile(avatarGroupRegex.toString()); - - AVATAR_GERD = getPredefinedAvatar("æ¥½å¤©å®¶ ã²ã«ã"); + AVATAR_GERD = getAvatarById("gerd"); assert AVATAR_LIST instanceof RandomAccess; assert AVATAR_GERD != null; @@ -81,20 +62,24 @@ public class Avatar implements Comparable { private final String fullName; private final int idNum; private final String identifier; - private final int hashNum; /** - * Avatarãçæããã + * constructor. + * + *

å¨ã¦ã®å¼æ°ã¯ä»ã®ã¤ã³ã¹ã¿ã³ã¹ã«å¯¾ãã¦ãã¼ã¯ã§ãªããã°ãªããªãã + * * @param name åå * @param jobTitle è·æ¥å * @param idNum éãçªå· * @param identifier èå¥æåå */ private Avatar(String name, - String jobTitle, - int idNum, - String identifier ){ + String jobTitle, + int idNum, + String identifier ){ + super(); + this.name = name.intern(); this.jobTitle = jobTitle.intern(); this.idNum = idNum; @@ -102,69 +87,50 @@ public class Avatar implements Comparable { this.fullName = (this.jobTitle + " " + this.name).intern(); - this.hashNum = this.fullName.hashCode() ^ this.idNum; - return; } + /** - * Avatarãçæããã - * @param fullName ãã«ãã¼ã + * Avatarãªã¹ããçæããã + * + * Avatarã®å¨ã¤ã³ã¹ã¿ã³ã¹ã¯ãã®ãªã¹ãã«å«ã¾ããã + * + * @return ã½ã¼ããããå®ç¾©æ¸ã¿Avatarã®ãªã¹ã */ - // TODO å½é¢ã¯å¼ã°ããªãã¯ããZå½ã¨ãåãã - public Avatar(String fullName){ - this.fullName = fullName.intern(); - this.idNum = -1; - - String[] tokens = this.fullName.split("\\p{Blank}+", 2); - if(tokens.length == 1){ - this.jobTitle = null; - this.name = this.fullName; - }else if(tokens.length == 2){ - this.jobTitle = tokens[0].intern(); - this.name = tokens[1].intern(); - }else{ - this.jobTitle = null; - this.name = null; - assert false; - } - - this.identifier = "???".intern(); - - this.hashNum = this.fullName.hashCode() ^ this.idNum; + private static List buildAvatarList(){ + List result; - return; - } + List predefs = CoreData.getPreDefAvatarList(); + result = predefs.stream() + .map(preDefAvatar -> toAvatar(preDefAvatar)) + .sorted() + .collect(Collectors.toList()); + result = Collections.unmodifiableList(result); + + return result; + } /** - * å®ç¾©æ¸ã¿Avatarç¾¤ã®çæã - * @param predefs å®ç¾©æ¸ã¿Avataråãã¼ã¿ç¾¤ - * @return ã½ã¼ããããå®ç¾©æ¸ã¿Avatarã®ãªã¹ã + * å®ç¾©æ¸ã¿AvatarããAvatarã¸ã®å¤æãè¡ãã + * + * @param pre å®ç¾©æ¸ã¿Avatar + * @return Avatar */ - private static List buildAvatarList(List predefs){ - List result = new ArrayList<>(predefs.size()); - - for(PreDefAvatar preDefAvatar : predefs){ - String shortName = preDefAvatar.getShortName(); - String jobTitle = preDefAvatar.getJobTitle(); - int serialNo = preDefAvatar.getSerialNo(); - String avatarId = preDefAvatar.getAvatarId(); - Avatar avatar = new Avatar(shortName, - jobTitle, - serialNo, - avatarId ); - result.add(avatar); - } - - Collections.sort(result); - result = Collections.unmodifiableList(result); + private static Avatar toAvatar(PreDefAvatar pre){ + String shortName = pre.getShortName(); + String jobTitle = pre.getJobTitle(); + int serialNo = pre.getSerialNo(); + String avatarId = pre.getAvatarId(); + Avatar result = new Avatar(shortName, jobTitle, serialNo, avatarId); return result; } /** * å®ç¾©æ¸ã¿Avatarç¾¤ã®ãªã¹ããè¿ãã + * * @return Avatarã®ãªã¹ã */ public static List getPredefinedAvatarList(){ @@ -172,52 +138,29 @@ public class Avatar implements Comparable { } /** - * å®ç¾©æ¸ã¿Avatarãè¿ãã - * @param fullName Avatarã®ãã«ãã¼ã + * ãã«ãã¼ã ã«åè´ããAvatarãè¿ãã + * + * @param fullNameArg Avatarã®ãã«ãã¼ã * @return Avatarããã«ãã¼ã ãä¸è´ããAvatarãç¡ããã°null */ - // TODO 20ãã£ã©ç¨åº¦ãªãListããªããæ¹ãæ©ããï¼ - public static Avatar getPredefinedAvatar(String fullName){ - return AVATAR_MAP.get(fullName); + public static Avatar getAvatarByFullname(String fullNameArg){ + return AVATAR_FN_MAP.get(fullNameArg); } /** - * å®ç¾©æ¸ã¿Avatarãè¿ãã - * @param fullName Avatarã®ãã«ãã¼ã - * @return Avatarããã«ãã¼ã ãä¸è´ããAvatarãç¡ããã°null + * IDã«åè´ããAvatarãè¿ãã + * + * @param avatarId Avatarã®ID + * @return AvatarãIDãä¸è´ããAvatarãç¡ããã°null */ - public static Avatar getPredefinedAvatar(CharSequence fullName){ - for(Avatar avatar : AVATAR_LIST){ - String avatarName = avatar.getFullName(); - if(avatarName.contentEquals(fullName)){ - return avatar; - } - } - return null; + public static Avatar getAvatarById(String avatarId){ + return AVATAR_ID_MAP.get(avatarId); } - /** - * å®ç¾©æ¸ã¿Avataråã«ä¸è´ããªããèª¿ã¹ãã - * @param matcher ãããã£ - * @return ä¸è´ããAvatarãä¸è´ããªããã°nullã - */ - public static Avatar lookingAtAvatar(Matcher matcher){ - matcher.usePattern(AVATAR_PATTERN); - - if( ! matcher.lookingAt() ) return null; - int groupCt = matcher.groupCount(); - for(int group = 1; group <= groupCt; group++){ - if(matcher.start(group) >= 0){ - Avatar avatar = AVATAR_LIST.get(group - 1); - return avatar; - } - } - - return null; - } /** * ãã«ãã¼ã ãåå¾ããã + * * @return ãã«ãã¼ã */ public String getFullName(){ @@ -226,6 +169,7 @@ public class Avatar implements Comparable { /** * è·æ¥åãåå¾ããã + * * @return è·æ¥å */ public String getJobTitle(){ @@ -234,6 +178,7 @@ public class Avatar implements Comparable { /** * éå¸¸åãåå¾ããã + * * @return éå¸¸å */ public String getName(){ @@ -242,6 +187,7 @@ public class Avatar implements Comparable { /** * éãçªå·ãè¿ãã + * * @return éãçªå· */ public int getIdNum(){ @@ -249,7 +195,8 @@ public class Avatar implements Comparable { } /** - * èå¥æååãè¿ãã + * AvatarIDèå¥æååãè¿ãã + * * @return èå¥æåå */ public String getIdentifier(){ @@ -258,39 +205,7 @@ public class Avatar implements Comparable { /** * {@inheritDoc} - * @param obj {@inheritDoc} - * @return {@inheritDoc} - */ - @Override - public boolean equals(Object obj){ - if(this == obj){ - return true; - } - - if( ! (obj instanceof Avatar) ){ - return false; - } - Avatar other = (Avatar) obj; - - boolean nameMatch = this.fullName.equals(other.fullName); - boolean idMatch = this.idNum == other.idNum; - - if(nameMatch && idMatch) return true; - - return false; - } - - /** - * {@inheritDoc} - * @return {@inheritDoc} - */ - @Override - public int hashCode(){ - return this.hashNum; - } - - /** - * {@inheritDoc} + * * @return {@inheritDoc} */ @Override @@ -300,6 +215,7 @@ public class Avatar implements Comparable { /** * {@inheritDoc} + * * éãçªå·é ã«é åºã¥ããã * @param avatar {@inheritDoc} * @return {@inheritDoc} diff --git a/src/main/java/jp/sfjp/jindolf/data/CoreData.java b/src/main/java/jp/sfjp/jindolf/data/CoreData.java new file mode 100644 index 0000000..e679858 --- /dev/null +++ b/src/main/java/jp/sfjp/jindolf/data/CoreData.java @@ -0,0 +1,115 @@ +/* + * core data + * + * License : The MIT License + * Copyright(c) 2020 olyutorskii + */ + +package jp.sfjp.jindolf.data; + +import java.io.IOException; +import java.net.URISyntaxException; +import java.util.List; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.ParserConfigurationException; +import jp.sfjp.jindolf.dxchg.XmlUtils; +import jp.sourceforge.jindolf.corelib.LandDef; +import jp.sourceforge.jindolf.corelib.PreDefAvatar; +import org.xml.sax.SAXException; + +/** + * JinCore åç¨®åºå®ãã¼ã¿ã®ãã¼ãã + * + *

I/Oã¯ãªã½ã¼ã¹ã¸ã®ã¢ã¯ã»ã¹ãåæã¨ããç°å¸¸ç³»ã¯ãªã«ãã¼ããªãã + */ +public final class CoreData{ + + private static final List LIST_LANDDEF; + private static final List LIST_PREDEFAVATAR; + + static{ + try{ + LIST_LANDDEF = buildLandDefList(); + LIST_PREDEFAVATAR = buildPreDefAvatarList(); + }catch( IOException + | URISyntaxException + | ParserConfigurationException + | SAXException e + ){ + throw new ExceptionInInitializerError(e); + } + } + + + /** + * hidden constructor. + */ + private CoreData(){ + assert false; + } + + + /** + * load and build LandDef list. + * + * @return LandDef list + * @throws IOException resource IO error + * @throws URISyntaxException xml error + * @throws ParserConfigurationException xml error + * @throws SAXException xml error + */ + private static List buildLandDefList() + throws + IOException, + URISyntaxException, + ParserConfigurationException, + SAXException + { + DocumentBuilder builder = XmlUtils.createDocumentBuilder(); + List result = LandDef.buildLandDefList(builder); + return result; + } + + /** + * load and build PreDefAvatar list. + * + * @return PreDefAvatar list + * @throws IOException resource IO error + * @throws URISyntaxException xml error + * @throws ParserConfigurationException xml error + * @throws SAXException xml error + */ + private static List buildPreDefAvatarList() + throws + IOException, + URISyntaxException, + ParserConfigurationException, + SAXException + { + DocumentBuilder builder = XmlUtils.createDocumentBuilder(); + List result = + PreDefAvatar.buildPreDefAvatarList(builder); + return result; + + } + + + /** + * return LandDef list. + * + * @return list + */ + public static List getLandDefList(){ + return LIST_LANDDEF; + } + + /** + * return PreDefAvatar list. + * + * @return list + */ + public static List getPreDefAvatarList(){ + return LIST_PREDEFAVATAR; + } + +} diff --git a/src/main/java/jp/sfjp/jindolf/data/InterPlay.java b/src/main/java/jp/sfjp/jindolf/data/InterPlay.java new file mode 100644 index 0000000..babf053 --- /dev/null +++ b/src/main/java/jp/sfjp/jindolf/data/InterPlay.java @@ -0,0 +1,55 @@ +/* + * interplay + * + * License : The MIT License + * Copyright(c) 2020 olyutorskii + */ + +package jp.sfjp.jindolf.data; + +/** + * Avataréã®è¡çºé¢ä¿ã + * + *

è¡çºãè¡ãèã¨è¡çºã®å¯¾è±¡èããæ§æãããã + * + *

å¦åæç¥¨ãè¥²æãªã©ã + */ +public class InterPlay { + + private final Avatar byWhom; + private final Avatar target; + + + /** + * constructor. + * + * @param byWhom è¡çºè + * @param target è¡çºã®å¯¾è±¡ + */ + public InterPlay(Avatar byWhom, Avatar target){ + super(); + this.byWhom = byWhom; + this.target = target; + return; + } + + + /** + * è¡çºèãè¿ãã + * + * @return è¡çºè + */ + public Avatar getByWhom(){ + return this.byWhom; + } + + /** + * è¡çºå¯¾è±¡ãè¿ãã + * + * @return è¡çºå¯¾è±¡ + */ + public Avatar getTarget(){ + return this.target; + } + +} diff --git a/src/main/java/jp/sfjp/jindolf/data/Land.java b/src/main/java/jp/sfjp/jindolf/data/Land.java index ddef69c..e74b936 100644 --- a/src/main/java/jp/sfjp/jindolf/data/Land.java +++ b/src/main/java/jp/sfjp/jindolf/data/Land.java @@ -11,42 +11,25 @@ import java.awt.image.BufferedImage; import java.io.IOException; import java.net.MalformedURLException; import java.net.URI; -import java.net.URISyntaxException; import java.net.URL; import java.util.Collections; import java.util.LinkedList; import java.util.List; -import java.util.SortedSet; -import java.util.TreeSet; import java.util.logging.Level; import java.util.logging.Logger; -import jp.osdn.jindolf.parser.HtmlAdapter; -import jp.osdn.jindolf.parser.HtmlParseException; -import jp.osdn.jindolf.parser.HtmlParser; -import jp.osdn.jindolf.parser.PageType; -import jp.osdn.jindolf.parser.SeqRange; -import jp.osdn.jindolf.parser.content.DecodedContent; -import jp.sfjp.jindolf.net.HtmlSequence; import jp.sfjp.jindolf.net.ServerAccess; import jp.sourceforge.jindolf.corelib.LandDef; -import jp.sourceforge.jindolf.corelib.LandState; -import jp.sourceforge.jindolf.corelib.VillageState; /** * ãããããå½ãã */ public class Land { - // å¤å½ID - private static final String ID_VANILLAWOLF = "wolf"; - private static final Logger LOGGER = Logger.getAnonymousLogger(); private final LandDef landDef; private final ServerAccess serverAccess; - private final HtmlParser parser = new HtmlParser(); - private final VillageListHandler handler = new VillageListHandler(); private final List villageList = new LinkedList<>(); @@ -69,89 +52,11 @@ public class Land { } this.serverAccess = new ServerAccess(url, this.landDef.getEncoding()); - this.parser.setBasicHandler(this.handler); - return; } /** - * ã¯ã¨ãªã¼æååããç¹å®ãã¼ã®å¤ãå¾ãã - * ã¯ã¨ãªã¼ã®æ¸å¼ä¾ï¼ã{@literal a=b&c=d&e=f}ããã®å ´åãã¼cã®å¤ã¯d - * @param key ãã¼ - * @param allQuery ã¯ã¨ãªã¼ - * @return å¤ - */ - public static String getValueFromCGIQueries(String key, - String allQuery){ - String result = null; - - String[] queries = allQuery.split("\\Q&\\E"); - - for(String pair : queries){ - if(pair == null) continue; - String[] namevalue = pair.split("\\Q=\\E"); - if(namevalue == null) continue; - if(namevalue.length != 2) continue; - String name = namevalue[0]; - String value = namevalue[1]; - if(name == null) continue; - if( name.equals(key) ){ - result = value; - if(result == null) continue; - if(result.length() <= 0) continue; - break; - } - } - - return result; - } - - /** - * Aã¿ã°ã®HREFå±æ§å¤ããã¯ã¨ãªã¼é¨ãæ½åºããã - * ã{@literal &}ãã¯ã{@literal &}ãã«è§£éãããã - * @param hrefValue HREFå±æ§å¤ - * @return ã¯ã¨ãªã¼æåå - */ - public static String getRawQueryFromHREF(CharSequence hrefValue){ - if(hrefValue == null) return null; - - // HTML 4.01 B.2.2 rule - String pureHREF = hrefValue.toString().replace("&", "&"); - - URI uri; - try{ - uri = new URI(pureHREF); - }catch(URISyntaxException e){ - LOGGER.warning( - "ä¸æ£ãªURI[" - + hrefValue - + "]ãæ¤åºãã¾ãã"); - return null; - } - - String rawQuery = uri.getRawQuery(); - - return rawQuery; - } - - /** - * Aã¿ã°ã®HREFå±æ§å¤ããæIDãå¾ãã - * @param hrefValue HREFå¤ - * @return village æID - */ - public static String getVillageIDFromHREF(CharSequence hrefValue){ - String rawQuery = getRawQueryFromHREF(hrefValue); - if(rawQuery == null) return null; - - String villageID = getValueFromCGIQueries("vid", rawQuery); - if(villageID == null) return null; - if(villageID.length() <= 0) return null; - - return villageID; - } - - /** * å½å®ç¾©ãå¾ãã * @return å½å®ç¾© */ @@ -240,66 +145,10 @@ public class Land { } /** - * æä¸è¦§æå ±ããã¦ã³ãã¼ãããã - * ãªã¹ãåæå ±ã¯å½ã®ããããã¼ã¸ã¨æä¸è¦§ãã¼ã¸ã - * å¤å½ã®å ´åã¯æä¸è¦§ã«ã¢ã¯ã»ã¹ããããããã¼ã¸ã®ã¿ã - * å¤å½ä»¥å¤ã§æå»ºã¦ããããå½ã¯ããããã¼ã¸ã«ã¢ã¯ã»ã¹ããªãã - * æãªã¹ãã¯Villageã®å®è£ã«å¾ãã½ã¼ãããããéè¤ããæã¯æé¤ã - * - * @return ã½ã¼ããããæä¸è¦§ - * @throws java.io.IOException ãããã¯ã¼ã¯å¥åºåã®ç°å¸¸ - */ - public SortedSet downloadVillageList() throws IOException { - LandDef thisLand = getLandDef(); - LandState state = thisLand.getLandState(); - boolean isVanillaWolf = thisLand.getLandId().equals(ID_VANILLAWOLF); - - ServerAccess server = getServerAccess(); - - // ãã¾ã«åãæãè¤æ°ååºç¾ããã®ã§æ³¨æï¼ - SortedSet result = new TreeSet<>(); - - // ããããã¼ã¸ - if(state.equals(LandState.ACTIVE) || isVanillaWolf){ - HtmlSequence html = server.getHTMLTopPage(); - DecodedContent content = html.getContent(); - try{ - this.parser.parseAutomatic(content); - }catch(HtmlParseException e){ - LOGGER.log(Level.WARNING, "ããããã¼ã¸ãèªèã§ããªã", e); - } - List list = this.handler.getVillageList(); - if(list != null){ - result.addAll(list); - } - } - - // æä¸è¦§ãã¼ã¸ - if( ! isVanillaWolf ){ - HtmlSequence html = server.getHTMLLandList(); - DecodedContent content = html.getContent(); - try{ - this.parser.parseAutomatic(content); - }catch(HtmlParseException e){ - LOGGER.log(Level.WARNING, "æä¸è¦§ãã¼ã¸ãèªèã§ããªã", e); - } - List list = this.handler.getVillageList(); - if(list != null){ - result.addAll(list); - } - } - - this.parser.reset(); - this.handler.reset(); - - return result; - } - - /** * æãªã¹ããæ´æ°ããã * @param vset ã½ã¼ãæ¸ã¿ã®æä¸è¦§ */ - public void updateVillageList(SortedSet vset){ + public void updateVillageList(List vset){ // TODO æãªã¹ãæ´æ°ã®ã¤ãã³ããªã¹ããããã¨ä¾¿å©ãï¼ this.villageList.clear(); this.villageList.addAll(vset); @@ -315,126 +164,4 @@ public class Land { return getLandDef().getLandName(); } - /** - * æä¸è¦§åå¾ç¨ãã³ãã©ã - */ - private class VillageListHandler extends HtmlAdapter{ - - private List villageList = null; - - /** - * ã³ã³ã¹ãã©ã¯ã¿ã - */ - public VillageListHandler(){ - super(); - return; - } - - /** - * æä¸è¦§ãè¿ãã - * ååº¦ãã¼ã¹ãè¡ãã¾ã§å¼ãã§ã¯ãããªãã - * @return æä¸è¦§ - * @throws IllegalStateException ãã¼ã¹åã«å¼ã³åºãããã - * ãããã¯ãã¼ã¹å¾ãã§ã«ãªã»ããããã¦ããã - */ - public List getVillageList() throws IllegalStateException{ - if(this.villageList == null){ - throw new IllegalStateException("ãã¼ã¹ãå¿è¦ã§ãã"); - } - - List result = this.villageList; - - return result; - } - - /** - * ãªã»ãããè¡ãã - * æä¸è¦§ã¯ç©ºã«ãªãã - */ - public void reset(){ - this.villageList = null; - return; - } - - /** - * {@inheritDoc} - * æä¸è¦§ãªã¹ããåæåãããã - * @param content {@inheritDoc} - * @throws HtmlParseException {@inheritDoc} - */ - @Override - public void startParse(DecodedContent content) - throws HtmlParseException{ - reset(); - this.villageList = new LinkedList<>(); - return; - } - - /** - * {@inheritDoc} - * èªåå¤å®ã®çµæãããããã¼ã¸ã§ãæä¸è¦§ãã¼ã¸ã§ããªããã° - * ä¾å¤ãæããã - * @param type {@inheritDoc} - * @throws HtmlParseException {@inheritDoc} æå³ããªããã¼ã¸ãæ¥ãã - */ - @Override - public void pageType(PageType type) throws HtmlParseException{ - if( type != PageType.VILLAGELIST_PAGE - && type != PageType.TOP_PAGE ){ - throw new HtmlParseException( - "ããããã¼ã¸ãæä¸è¦§ãã¼ã¸ãå¿è¦ã§ãã"); - } - return; - } - - /** - * {@inheritDoc} - * @param content {@inheritDoc} - * @param anchorRange {@inheritDoc} - * @param villageRange {@inheritDoc} - * @param hour {@inheritDoc} - * @param minute {@inheritDoc} - * @param villageState {@inheritDoc} - * @throws HtmlParseException {@inheritDoc} - */ - @Override - public void villageRecord(DecodedContent content, - SeqRange anchorRange, - SeqRange villageRange, - int hour, int minute, - VillageState villageState) - throws HtmlParseException{ - LandDef landdef = getLandDef(); - LandState landState = landdef.getLandState(); - - CharSequence href = anchorRange.sliceSequence(content); - String villageID = getVillageIDFromHREF(href); - if( villageID == null - || villageID.length() <= 0 ){ - LOGGER.warning( - "èªèã§ããªãURL[" + href + "]ã«ééãã¾ããã"); - return; - } - - CharSequence fullVillageName = - villageRange.sliceSequence(content); - - // TODO æ¢ã«åºæ¥ã¦ãããããããªãVillageãååº¦ä½ãã®ã¯ç¡é§ï¼ - Village village = new Village(Land.this, - villageID, - fullVillageName.toString() ); - - if(landState == LandState.HISTORICAL){ - village.setState(VillageState.GAMEOVER); - }else{ - village.setState(villageState); - } - - this.villageList.add(village); - - return; - } - - } - } diff --git a/src/main/java/jp/sfjp/jindolf/data/LandsModel.java b/src/main/java/jp/sfjp/jindolf/data/LandsTreeModel.java similarity index 93% rename from src/main/java/jp/sfjp/jindolf/data/LandsModel.java rename to src/main/java/jp/sfjp/jindolf/data/LandsTreeModel.java index 7804e03..1e33b81 100644 --- a/src/main/java/jp/sfjp/jindolf/data/LandsModel.java +++ b/src/main/java/jp/sfjp/jindolf/data/LandsTreeModel.java @@ -7,32 +7,25 @@ package jp.sfjp.jindolf.data; -import java.io.IOException; -import java.net.URISyntaxException; import java.util.Collections; import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; -import java.util.logging.Level; import java.util.logging.Logger; import javax.swing.event.EventListenerList; import javax.swing.event.TreeModelEvent; import javax.swing.event.TreeModelListener; import javax.swing.tree.TreeModel; import javax.swing.tree.TreePath; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.ParserConfigurationException; -import jp.sfjp.jindolf.dxchg.XmlUtils; import jp.sourceforge.jindolf.corelib.LandDef; -import org.xml.sax.SAXException; /** * å½ã®éåããããããã¼ã¿ã¢ãã«ã®å¤§åã * å½ä¸è¦§ã¨æä¸è¦§ãç®¡çã * JTreeã®ã¢ãã«ãå¼ç¨ã */ -public class LandsModel implements TreeModel{ // ComboBoxModelãä»ãããï¼ +public class LandsTreeModel implements TreeModel{ // ComboBoxModelãä»ãããï¼ private static final String ROOT = "ROOT"; private static final int SECTION_INTERVAL = 100; @@ -55,7 +48,7 @@ public class LandsModel implements TreeModel{ // ComboBoxModelãä»ãããï¼ * ã³ã³ã¹ãã©ã¯ã¿ã * ãã®æç¹ã§ã¯ã¾ã å½ä¸è¦§ãèªã¿è¾¼ã¾ããªãã */ - public LandsModel(){ + public LandsTreeModel(){ super(); return; } @@ -95,23 +88,12 @@ public class LandsModel implements TreeModel{ // ComboBoxModelãä»ãããï¼ this.landList.clear(); - List landDefList; - try{ - DocumentBuilder builder = XmlUtils.createDocumentBuilder(); - landDefList = LandDef.buildLandDefList(builder); - }catch( IOException - | SAXException - | URISyntaxException - | ParserConfigurationException - e){ - LOGGER.log(Level.SEVERE, "failed to load land list", e); - return; - } - - for(LandDef landDef : landDefList){ - Land land = new Land(landDef); + List landDefList = CoreData.getLandDefList(); + landDefList.stream().map((landDef) -> + new Land(landDef) + ).forEachOrdered((land) -> { this.landList.add(land); - } + }); this.isLandListLoaded = true; diff --git a/src/main/java/jp/sfjp/jindolf/data/Nominated.java b/src/main/java/jp/sfjp/jindolf/data/Nominated.java new file mode 100644 index 0000000..13fd565 --- /dev/null +++ b/src/main/java/jp/sfjp/jindolf/data/Nominated.java @@ -0,0 +1,50 @@ +/* + * nominated with execution info + * + * License : The MIT License + * Copyright(c) 2020 olyutorskii + */ + +package jp.sfjp.jindolf.data; + +/** + * å¦åæç¥¨ã®å¦ååå¥éè¨ã + */ +public class Nominated { + + private final Avatar avatar; + private final int count; + + + /** + * constructor. + * + * @param avatar å¦åå¸æåAvatar + * @param count å¦åç¥¨æ° + */ + public Nominated(Avatar avatar, int count){ + super(); + this.avatar = avatar; + this.count = count; + return; + } + + /** + * å¦åå¸æåAvatarãè¿ãã + * + * @return Avatar + */ + public Avatar getAvatar(){ + return this.avatar; + } + + /** + * å¦åç¥¨æ°ãè¿ãã + * + * @return ç¥¨æ° + */ + public int getCount(){ + return this.count; + } + +} diff --git a/src/main/java/jp/sfjp/jindolf/data/Period.java b/src/main/java/jp/sfjp/jindolf/data/Period.java index e06493d..32608bd 100644 --- a/src/main/java/jp/sfjp/jindolf/data/Period.java +++ b/src/main/java/jp/sfjp/jindolf/data/Period.java @@ -7,34 +7,15 @@ package jp.sfjp.jindolf.data; -import java.io.IOException; import java.util.Collections; -import java.util.HashMap; import java.util.HashSet; import java.util.LinkedList; import java.util.List; -import java.util.Map; +import java.util.Objects; import java.util.Set; -import java.util.logging.Level; -import java.util.logging.Logger; -import jp.osdn.jindolf.parser.EntityConverter; -import jp.osdn.jindolf.parser.HtmlAdapter; -import jp.osdn.jindolf.parser.HtmlParseException; -import jp.osdn.jindolf.parser.HtmlParser; -import jp.osdn.jindolf.parser.PageType; -import jp.osdn.jindolf.parser.SeqRange; -import jp.osdn.jindolf.parser.content.DecodedContent; -import jp.sfjp.jindolf.net.HtmlSequence; -import jp.sfjp.jindolf.net.ServerAccess; -import jp.sfjp.jindolf.util.StringUtils; -import jp.sourceforge.jindolf.corelib.EventFamily; -import jp.sourceforge.jindolf.corelib.GameRole; import jp.sourceforge.jindolf.corelib.LandDef; import jp.sourceforge.jindolf.corelib.PeriodType; import jp.sourceforge.jindolf.corelib.SysEventType; -import jp.sourceforge.jindolf.corelib.TalkType; -import jp.sourceforge.jindolf.corelib.Team; -import jp.sourceforge.jindolf.corelib.VillageState; /** * ãããããæ¥ãã @@ -44,29 +25,15 @@ import jp.sourceforge.jindolf.corelib.VillageState; * äººæ°ã®ãªããããã¼ã°ãªã©ã§ã * 24æéä»¥ä¸ã®æéãæã¤Periodãçæãããå¯è½æ§ã®èæ®ãå¿è¦ã */ -public class Period{ +public final class Period{ // TODO Comparable ã implement ããï¼ - private static final HtmlParser PARSER = new HtmlParser(); - private static final PeriodHandler HANDLER = - new PeriodHandler(); - - private static final Logger LOGGER = Logger.getAnonymousLogger(); - - static{ - PARSER.setBasicHandler (HANDLER); - PARSER.setSysEventHandler(HANDLER); - PARSER.setTalkHandler (HANDLER); - } - private final Village homeVillage; private final PeriodType periodType; private final int day; private int limitHour; private int limitMinute; // TODO æ´æ°ææ¥ãå¥ããã¹ããã - private String loginName; - private boolean isFullOpen = false; private final List topicList = new LinkedList<>(); private final List unmodList = @@ -74,50 +41,25 @@ public class Period{ /** - * ãã® Period ãé²è¡ä¸ã®æã®ææ°æ¥ã§ã - * ä»ã¾ãã«æ¬¡ãã¨çºè¨ãèç©ããã¦ããã¨ãã¯ - * true ã«ãªãã - * â»éè¦: Hot ãª Period ã¯ meslog ã¯ã¨ãªã¼ãä½¿ã£ã¦ãã¦ã³ãã¼ãã§ããªãã - */ - private boolean isHot; - - - /** * Periodãçæããã - * ãã®æ®µéã§ã¯çºè¨ãã¼ã¿ã®ãã¼ãã¯è¡ãããªãã - * ããã©ã«ãã§éHotç¶æã + * + *

ãã®æ®µéã§ã¯çºè¨ãã¼ã¿ã®ãã¼ãã¯è¡ãããªãã + * * @param homeVillage æå±ããVillage * @param periodType Periodç¨®å¥ * @param day Periodéçª * @throws java.lang.NullPointerException å¼æ°ã«nullãæ¸¡ãããå ´åã */ public Period(Village homeVillage, - PeriodType periodType, - int day) - throws NullPointerException{ - this(homeVillage, periodType, day, false); - return; - } + PeriodType periodType, + int day){ + Objects.nonNull(homeVillage); + Objects.nonNull(periodType); - /** - * Periodãçæããã - * ãã®æ®µéã§ã¯çºè¨ãã¼ã¿ã®ãã¼ãã¯è¡ãããªãã - * @param homeVillage æå±ããVillage - * @param periodType Periodç¨®å¥ - * @param day Periodéçª - * @param isHot Hotãå¦ã - * @throws java.lang.NullPointerException å¼æ°ã«nullãæ¸¡ãããå ´åã - */ - private Period(Village homeVillage, - PeriodType periodType, - int day, - boolean isHot) - throws NullPointerException{ - if( homeVillage == null - || periodType == null ) throw new NullPointerException(); if(day < 0){ throw new IllegalArgumentException("Period day is too small !"); } + switch(periodType){ case PROLOGUE: assert day == 0; @@ -137,59 +79,13 @@ public class Period{ unload(); - this.isHot = isHot; - return; } /** - * Periodãæ´æ°ãããTopicã®ãªã¹ããæ´æ°ãããã - * @param period æ¥ - * @param force trueãªãå¼·å¶åèªã¿è¾¼ã¿ã - * falseãªãã¾ã èªã¿è¾¼ãã§ç¡ãæã®ã¿èªã¿è¾¼ã¿ã - * @throws IOException ãããã¯ã¼ã¯å¥åã¨ã©ã¼ - */ - public static void parsePeriod(Period period, boolean force) - throws IOException{ - if( ! force && period.hasLoaded() ) return; - - Village village = period.getVillage(); - Land land = village.getParentLand(); - ServerAccess server = land.getServerAccess(); - - if(village.getState() != VillageState.PROGRESS){ - period.isFullOpen = true; - }else if(period.getType() != PeriodType.PROGRESS){ - period.isFullOpen = true; - }else{ - period.isFullOpen = false; - } - - HtmlSequence html = server.getHTMLPeriod(period); - - period.topicList.clear(); - - boolean wasHot = period.isHot(); - - HANDLER.setPeriod(period); - DecodedContent content = html.getContent(); - try{ - PARSER.parseAutomatic(content); - }catch(HtmlParseException e){ - LOGGER.log(Level.WARNING, "çºè¨æ½åºã«å¤±æ", e); - } - - if(wasHot && ! period.isHot() ){ - parsePeriod(period, true); - return; - } - - return; - } - - /** * æå±ããæãè¿ãã + * * @return æ */ public Village getVillage(){ @@ -198,6 +94,7 @@ public class Period{ /** * Periodç¨®å¥ãè¿ãã + * * @return ç¨®å¥ */ public PeriodType getType(){ @@ -206,9 +103,11 @@ public class Period{ /** * Periodéçªãè¿ãã - * ãããã¼ã°ã¯å¸¸ã«0çªã - * næ¥ç®ã®ã²ã¼ã é²è¡æ¥ã¯nçª - * ã¨ããã¼ã°ã¯æå¾ã®ã²ã¼ã é²è¡æ¥+1çª + * + *

ãããã¼ã°ã¯å¸¸ã«0çªã + * næ¥ç®ã®ã²ã¼ã é²è¡æ¥ã¯nçªã + * ã¨ããã¼ã°ã¯æå¾ã®ã²ã¼ã é²è¡æ¥+1çªã + * * @return Periodéçª */ public int getDay(){ @@ -216,7 +115,20 @@ public class Period{ } /** + * æ´æ°æå»ãè¨å®ããã + * + * @param hour æ + * @param minute å + */ + public void setLimit(int hour, int minute){ + this.limitHour = hour; + this.limitMinute = minute; + return; + } + + /** * æ´æ°æå»ã®æåè¡¨è¨ãè¿ãã + * * @return æ´æ°æå»ã®æåè¡¨è¨ */ public String getLimit(){ @@ -232,23 +144,8 @@ public class Period{ } /** - * Hotãå¦ãè¿ãã - * @return Hotãå¦ã - */ - public boolean isHot(){ - return this.isHot; - } - - /** - * Hotãå¦ãè¨å®ããã - * @param isHotArg Hotæå® - */ - public void setHot(boolean isHotArg){ - this.isHot = isHotArg; - } - - /** * ãããã¼ã°ãå¦ãå¤å®ããã + * * @return ãããã¼ã°ãªãtrue */ public boolean isPrologue(){ @@ -258,6 +155,7 @@ public class Period{ /** * ã¨ããã¼ã°ãå¦ãå¤å®ããã + * * @return ã¨ããã¼ã°ãªãtrue */ public boolean isEpilogue(){ @@ -267,6 +165,7 @@ public class Period{ /** * é²è¡æ¥ãå¦ãå¤å®ããã + * * @return é²è¡æ¥ãªãtrue */ public boolean isProgress(){ @@ -276,6 +175,7 @@ public class Period{ /** * ãã®Periodã«ã¢ã¯ã»ã¹ããããã®ã¯ã¨ãªã¼ãçæããã + * * @return CGIã«æ¸¡ãã¯ã¨ãªã¼ */ public String getCGIQuery(){ @@ -284,11 +184,6 @@ public class Period{ Village village = getVillage(); result.append(village.getCGIQuery()); - if(isHot()){ - result.append("&mes=all"); // å¨è¡¨ç¤ºæå® - return result.toString(); - } - Land land = village.getParentLand(); LandDef ldef = land.getLandDef(); @@ -336,7 +231,9 @@ public class Period{ /** * Periodã«å«ã¾ããTopicã®ãªã¹ããè¿ãã - * ãã®ãªã¹ãã¯ä¸æ¸ãæä½ä¸è½ã + * + *

ãã®ãªã¹ãã¯ä¸æ¸ãæä½ä¸è½ã + * * @return Topicã®ãªã¹ã */ public List getTopicList(){ @@ -344,7 +241,16 @@ public class Period{ } /** + * Topicã®ãªã¹ãåå®¹ãæ¶ãã + */ + public void clearTopicList(){ + this.topicList.clear(); + return; + } + + /** * Periodã«å«ã¾ããTopicã®ç·æ°ãè¿ãã + * * @return Topicç·æ° */ public int getTopics(){ @@ -353,10 +259,11 @@ public class Period{ /** * Topicãè¿½å ããã + * * @param topic Topic * @throws java.lang.NullPointerException nullãæ¸¡ãããå ´åã */ - protected void addTopic(Topic topic) throws NullPointerException{ + public void addTopic(Topic topic) throws NullPointerException{ if(topic == null) throw new NullPointerException(); this.topicList.add(topic); return; @@ -364,7 +271,9 @@ public class Period{ /** * Periodã®ãã£ãã·ã§ã³æååãè¿ãã - * ä¸»ãªç¨éã¯ã¿ãç»é¢ã®è³ã®ã©ãã«ãªã©ã + * + *

ä¸»ãªç¨éã¯ã¿ãç»é¢ã®è³ã®ã©ãã«ãªã©ã + * * @return ãã£ãã·ã§ã³æåå */ public String getCaption(){ @@ -390,15 +299,8 @@ public class Period{ } /** - * ãã®Periodããã¦ã³ãã¼ãããã¨ãã®ãã°ã¤ã³åãè¿ãã - * @return ãã°ã¤ã³åããã°ã¢ã¦ãä¸ã¯nullã - */ - public String getLoginName(){ - return this.loginName; - } - - /** * å¬éçºè¨çªå·ã«ãããããçºè¨ãè¿ãã + * * @param talkNo å¬éçºè¨çªå· * @return çºè¨ãè¦ã¤ãããªããã°null */ @@ -415,19 +317,12 @@ public class Period{ } /** - * ãã®Periodã®åå®¹ã«ã²ã¼ã é²è¡ä¸é ãããé¨åãããå¯è½æ§ãå¤å®ããã - * @return é ããè¦ç´ ããããããªãfalse - */ - public boolean isFullOpen(){ - return this.isFullOpen; - } - - /** * ãã¼ãæ¸ã¿ãå¦ããã§ãã¯ããã + * * @return ãã¼ãæ¸ã¿ãªãtrue */ public boolean hasLoaded(){ - return getTopics() > 0; + return ! this.topicList.isEmpty(); } /** @@ -436,10 +331,6 @@ public class Period{ public void unload(){ this.limitHour = 0; this.limitMinute = 0; - this.loginName = null; - this.isFullOpen = false; - - this.isHot = false; this.topicList.clear(); @@ -448,8 +339,10 @@ public class Period{ /** * è¥²æã¡ãã»ã¼ã¸ã®æç¡ãå¤å®ããã - * æ±ºçãä»ãã¾ã§éç¼é£å¶ã«ã¯è¦ããªãã + * + *

æ±ºçãä»ãã¾ã§éç¼é£å¶ã«ã¯è¦ããªãã * å½è£GJã§ã¯ç¼ã«ãè¦ããªãã + * * @return è¥²æã¡ãã»ã¼ã¸ãããã°true */ public boolean hasAssaultTried(){ @@ -469,6 +362,7 @@ public class Period{ /** * å¦åãããAvatarãè¿ãã + * * @return å¦åãããAvatarãçªç¶æ»ãªã©ãªãããã®çç±ã§ããªãå ´åã¯null */ public Avatar getExecutedAvatar(){ @@ -486,6 +380,7 @@ public class Period{ /** * æç¥¨ã«åå ããAvatarã®éåãè¿ãã + * * @return æç¥¨ã«åå ããAvatarã®Set */ public Set getVoterSet(){ @@ -502,7 +397,9 @@ public class Period{ /** * ä»»æã®ã¿ã¤ãã®ã·ã¹ãã ã¤ãã³ããè¿ãã - * è¤æ°åå¨ããå ´åãè¿ãã®ã¯æåã®ä¸ã¤ã ãã + * + *

è¤æ°åå¨ããå ´åãè¿ãã®ã¯æåã®ä¸ã¤ã ãã + * * @param type ã¤ãã³ãã¿ã¤ã * @return ã·ã¹ãã ã¤ãã³ã */ @@ -516,735 +413,4 @@ public class Period{ return null; } - /** - * Periodãã¼ã¹ç¨ãã³ãã©ã - */ - private static class PeriodHandler extends HtmlAdapter{ - - private static final int TALKTYPE_NUM = TalkType.values().length; - - private final EntityConverter converter = - new EntityConverter(true); - // TODO: SMPé¢æåã«å½©è²å¯¾å¿ããã¾ã§ã®æ«å®æªç½® - - private final Map countMap = - new HashMap<>(); - - private Period period = null; - - private TalkType talkType; - private Avatar avatar; - private int talkNo; - private String anchorId; - private int talkHour; - private int talkMinute; - private DecodedContent talkContent = null; - - private EventFamily eventFamily; - private SysEventType sysEventType; - private DecodedContent eventContent = null; - private final List avatarList = new LinkedList<>(); - private final List roleList = new LinkedList<>(); - private final List integerList = new LinkedList<>(); - private final List charseqList = - new LinkedList<>(); - - /** - * ã³ã³ã¹ãã©ã¯ã¿ã - */ - public PeriodHandler(){ - super(); - return; - } - - /** - * ãã¼ã¹çµæãæ ¼ç´ããPeriodãè¨å®ããã - * @param period Period - */ - public void setPeriod(Period period){ - this.period = period; - return; - } - - /** - * æååæçããAvatarãå¾ãã - * æã«æªç»é²ã®Avatarã§ããã°ã¤ãã§ã«ç»é²ãããã - * @param content æåå - * @param range æåååã®Avatarãã«ãã¼ã ãç¤ºãé å - * @return Avatar - */ - private Avatar toAvatar(DecodedContent content, SeqRange range){ - Village village = this.period.getVillage(); - String fullName = this.converter - .convert(content, range) - .toString(); - Avatar result = village.getAvatar(fullName); - if(result == null){ - result = new Avatar(fullName); - village.addAvatar(result); - } - - return result; - } - - /** - * Avatarå¥ãä¼è©±ç¨®ãã¨ã«çºè¨åæ°ãã«ã¦ã³ãããã - * 1ããå§ã¾ãã - * @param targetAvatar å¯¾è±¡Avatar - * @param targetType å¯¾è±¡ä¼è©±ç¨® - * @return ã«ã¦ã³ãæ° - */ - private int countUp(Avatar targetAvatar, TalkType targetType){ - int[] countArray = this.countMap.get(targetAvatar); - if(countArray == null){ - countArray = new int[TALKTYPE_NUM]; - this.countMap.put(targetAvatar, countArray); - } - int count = ++countArray[targetType.ordinal()]; - return count; - } - - /** - * {@inheritDoc} - * @param content {@inheritDoc} - * @throws HtmlParseException {@inheritDoc} - */ - @Override - public void startParse(DecodedContent content) - throws HtmlParseException{ - this.period.loginName = null; - this.period.topicList.clear(); - this.countMap.clear(); - return; - } - - /** - * {@inheritDoc} - * @param content {@inheritDoc} - * @param loginRange {@inheritDoc} - * @throws HtmlParseException {@inheritDoc} - */ - @Override - public void loginName(DecodedContent content, SeqRange loginRange) - throws HtmlParseException{ - DecodedContent loginName = - this.converter.convert(content, loginRange); - - this.period.loginName = loginName.toString(); - - return; - } - - /** - * {@inheritDoc} - * @param type {@inheritDoc} - * @throws HtmlParseException {@inheritDoc} - */ - @Override - public void pageType(PageType type) throws HtmlParseException{ - if(type != PageType.PERIOD_PAGE){ - throw new HtmlParseException( - "æå³ããªããã¼ã¸ãèªã¿è¾¼ããã¨ãã¾ããã"); - } - return; - } - - /** - * {@inheritDoc} - * @param month {@inheritDoc} - * @param day {@inheritDoc} - * @param hour {@inheritDoc} - * @param minute {@inheritDoc} - * @throws HtmlParseException {@inheritDoc} - */ - @Override - public void commitTime(int month, int day, int hour, int minute) - throws HtmlParseException{ - this.period.limitHour = hour; - this.period.limitMinute = minute; - return; - } - - /** - * {@inheritDoc} - * èªåã¸ã®ãªã³ã¯ãç¡ãããã§ãã¯ããã - * èªåã¸ã®ãªã³ã¯ãè¦ã¤ããã°ãã®PeriodãéHotã«ããã - * èªåã¸ã®ãªã³ã¯ãããã¨ãããã¨ã¯ã - * ä»èªãã§ãHTMLã¯å¥ã®Periodã®ããã«æ¸ããããã®ã¨ãããã¨ã - * èããããåå ã¯ãHotã ã£ãPeriodãã²ã¼ã é²è¡ã«å¾ã - * Hotã§ãªããªã£ããã¨ã - * @param content {@inheritDoc} - * @param anchorRange {@inheritDoc} - * @param periodType {@inheritDoc} - * @param day {@inheritDoc} - * @throws HtmlParseException {@inheritDoc} - */ - @Override - public void periodLink(DecodedContent content, - SeqRange anchorRange, - PeriodType periodType, - int day) - throws HtmlParseException{ - - if(this.period.getType() != periodType) return; - - if( periodType == PeriodType.PROGRESS - && this.period.getDay() != day ){ - return; - } - - if( ! anchorRange.isValid() ) return; - - this.period.setHot(false); - - return; - } - - /** - * {@inheritDoc} - * @throws HtmlParseException {@inheritDoc} - */ - @Override - public void startTalk() throws HtmlParseException{ - this.talkType = null; - this.avatar = null; - this.talkNo = -1; - this.anchorId = null; - this.talkHour = -1; - this.talkMinute = -1; - this.talkContent = new DecodedContent(100 + 1); - - return; - } - - /** - * {@inheritDoc} - * @param type {@inheritDoc} - * @throws HtmlParseException {@inheritDoc} - */ - @Override - public void talkType(TalkType type) - throws HtmlParseException{ - this.talkType = type; - return; - } - - /** - * {@inheritDoc} - * @param content {@inheritDoc} - * @param avatarRange {@inheritDoc} - * @throws HtmlParseException {@inheritDoc} - */ - @Override - public void talkAvatar(DecodedContent content, SeqRange avatarRange) - throws HtmlParseException{ - this.avatar = toAvatar(content, avatarRange); - return; - } - - /** - * {@inheritDoc} - * @param hour {@inheritDoc} - * @param minute {@inheritDoc} - * @throws HtmlParseException {@inheritDoc} - */ - @Override - public void talkTime(int hour, int minute) - throws HtmlParseException{ - this.talkHour = hour; - this.talkMinute = minute; - return; - } - - /** - * {@inheritDoc} - * @param tno {@inheritDoc} - * @throws HtmlParseException {@inheritDoc} - */ - @Override - public void talkNo(int tno) throws HtmlParseException{ - this.talkNo = tno; - return; - } - - /** - * {@inheritDoc} - * @param content {@inheritDoc} - * @param idRange {@inheritDoc} - * @throws HtmlParseException {@inheritDoc} - */ - @Override - public void talkId(DecodedContent content, SeqRange idRange) - throws HtmlParseException{ - this.anchorId = content.subSequence(idRange.getStartPos(), - idRange.getEndPos() ) - .toString(); - return; - } - - /** - * {@inheritDoc} - * @param content {@inheritDoc} - * @param textRange {@inheritDoc} - * @throws HtmlParseException {@inheritDoc} - */ - @Override - public void talkText(DecodedContent content, SeqRange textRange) - throws HtmlParseException{ - this.converter.append(this.talkContent, content, textRange); - return; - } - - /** - * {@inheritDoc} - * @throws HtmlParseException {@inheritDoc} - */ - @Override - public void talkBreak() - throws HtmlParseException{ - this.talkContent.append('\n'); - return; - } - - /** - * {@inheritDoc} - * @throws HtmlParseException {@inheritDoc} - */ - @Override - public void endTalk() throws HtmlParseException{ - Talk talk = new Talk(this.period, - this.talkType, - this.avatar, - this.talkNo, - this.anchorId, - this.talkHour, this.talkMinute, - this.talkContent ); - - int count = countUp(this.avatar, this.talkType); - talk.setCount(count); - - this.period.addTopic(talk); - - this.talkType = null; - this.avatar = null; - this.talkNo = -1; - this.anchorId = null; - this.talkHour = -1; - this.talkMinute = -1; - this.talkContent = null; - - return; - } - - /** - * {@inheritDoc} - * @param family {@inheritDoc} - * @throws HtmlParseException {@inheritDoc} - */ - @Override - public void startSysEvent(EventFamily family) - throws HtmlParseException{ - this.eventFamily = family; - this.sysEventType = null; - this.eventContent = new DecodedContent(); - this.avatarList.clear(); - this.roleList.clear(); - this.integerList.clear(); - this.charseqList.clear(); - return; - } - - /** - * {@inheritDoc} - * @param type {@inheritDoc} - * @throws HtmlParseException {@inheritDoc} - */ - @Override - public void sysEventType(SysEventType type) - throws HtmlParseException{ - this.sysEventType = type; - return; - } - - /** - * {@inheritDoc} - * @param content {@inheritDoc} - * @param contentRange {@inheritDoc} - * @throws HtmlParseException {@inheritDoc} - */ - @Override - public void sysEventContent(DecodedContent content, - SeqRange contentRange) - throws HtmlParseException{ - this.converter.append(this.eventContent, content, contentRange); - return; - } - - /** - * {@inheritDoc} - * @param content {@inheritDoc} - * @param anchorRange {@inheritDoc} - * @param contentRange {@inheritDoc} - * @throws HtmlParseException {@inheritDoc} - */ - @Override - public void sysEventContentAnchor(DecodedContent content, - SeqRange anchorRange, - SeqRange contentRange) - throws HtmlParseException{ - this.converter.append(this.eventContent, content, contentRange); - return; - } - - /** - * {@inheritDoc} - * @throws HtmlParseException {@inheritDoc} - */ - @Override - public void sysEventContentBreak() throws HtmlParseException{ - this.eventContent.append('\n'); - return; - } - - /** - * {@inheritDoc} - * @param content {@inheritDoc} - * @param entryNo {@inheritDoc} - * @param avatarRange {@inheritDoc} - * @throws HtmlParseException {@inheritDoc} - */ - @Override - public void sysEventOnStage(DecodedContent content, - int entryNo, - SeqRange avatarRange) - throws HtmlParseException{ - Avatar newAvatar = toAvatar(content, avatarRange); - this.integerList.add(entryNo); - this.avatarList.add(newAvatar); - return; - } - - /** - * {@inheritDoc} - * @param role {@inheritDoc} - * @param num {@inheritDoc} - * @throws HtmlParseException {@inheritDoc} - */ - @Override - public void sysEventOpenRole(GameRole role, int num) - throws HtmlParseException{ - this.roleList.add(role); - this.integerList.add(num); - return; - } - - /** - * {@inheritDoc} - * @param content {@inheritDoc} - * @param avatarRange {@inheritDoc} - * @throws HtmlParseException {@inheritDoc} - */ - @Override - public void sysEventMurdered(DecodedContent content, - SeqRange avatarRange) - throws HtmlParseException{ - Avatar murdered = toAvatar(content, avatarRange); - this.avatarList.add(murdered); - return; - } - - /** - * {@inheritDoc} - * @param content {@inheritDoc} - * @param avatarRange {@inheritDoc} - * @throws HtmlParseException {@inheritDoc} - */ - @Override - public void sysEventSurvivor(DecodedContent content, - SeqRange avatarRange) - throws HtmlParseException{ - Avatar survivor = toAvatar(content, avatarRange); - this.avatarList.add(survivor); - return; - } - - /** - * {@inheritDoc} - * @param content {@inheritDoc} - * @param voteByRange {@inheritDoc} - * @param voteToRange {@inheritDoc} - * @throws HtmlParseException {@inheritDoc} - */ - @Override - public void sysEventCounting(DecodedContent content, - SeqRange voteByRange, - SeqRange voteToRange) - throws HtmlParseException{ - if(voteByRange.isValid()){ - Avatar voteBy = toAvatar(content, voteByRange); - this.avatarList.add(voteBy); - } - Avatar voteTo = toAvatar(content, voteToRange); - this.avatarList.add(voteTo); - return; - } - - /** - * {@inheritDoc} - * @param content {@inheritDoc} - * @param voteByRange {@inheritDoc} - * @param voteToRange {@inheritDoc} - * @throws HtmlParseException {@inheritDoc} - */ - @Override - public void sysEventCounting2(DecodedContent content, - SeqRange voteByRange, - SeqRange voteToRange) - throws HtmlParseException{ - sysEventCounting(content, voteByRange, voteToRange); - return; - } - - /** - * {@inheritDoc} - * @param content {@inheritDoc} - * @param avatarRange {@inheritDoc} - * @throws HtmlParseException {@inheritDoc} - */ - @Override - public void sysEventSuddenDeath(DecodedContent content, - SeqRange avatarRange) - throws HtmlParseException{ - Avatar suddenDeath = toAvatar(content, avatarRange); - this.avatarList.add(suddenDeath); - return; - } - - /** - * {@inheritDoc} - * @param content {@inheritDoc} - * @param avatarRange {@inheritDoc} - * @param anchorRange {@inheritDoc} - * @param loginRange {@inheritDoc} - * @param isLiving {@inheritDoc} - * @param role {@inheritDoc} - * @throws HtmlParseException {@inheritDoc} - */ - @Override - public void sysEventPlayerList(DecodedContent content, - SeqRange avatarRange, - SeqRange anchorRange, - SeqRange loginRange, - boolean isLiving, - GameRole role ) - throws HtmlParseException{ - Avatar who = toAvatar(content, avatarRange); - - CharSequence anchor; - if(anchorRange.isValid()){ - anchor = this.converter.convert(content, anchorRange); - }else{ - anchor = ""; - } - CharSequence account = this.converter - .convert(content, loginRange); - - Integer liveOrDead; - if(isLiving) liveOrDead = 1; - else liveOrDead = 0; - - this.avatarList.add(who); - this.charseqList.add(anchor); - this.charseqList.add(account); - this.integerList.add(liveOrDead); - this.roleList.add(role); - - return; - } - - /** - * {@inheritDoc} - * @param content {@inheritDoc} - * @param avatarRange {@inheritDoc} - * @param votes {@inheritDoc} - * @throws HtmlParseException {@inheritDoc} - */ - @Override - public void sysEventExecution(DecodedContent content, - SeqRange avatarRange, - int votes ) - throws HtmlParseException{ - Avatar who = toAvatar(content, avatarRange); - - this.avatarList.add(who); - this.integerList.add(votes); - - return; - } - - /** - * {@inheritDoc} - * @param hour {@inheritDoc} - * @param minute {@inheritDoc} - * @param minLimit {@inheritDoc} - * @param maxLimit {@inheritDoc} - * @throws HtmlParseException {@inheritDoc} - */ - @Override - public void sysEventAskEntry(int hour, int minute, - int minLimit, int maxLimit) - throws HtmlParseException{ - this.integerList.add(hour * 60 + minute); - this.integerList.add(minLimit); - this.integerList.add(maxLimit); - return; - } - - /** - * {@inheritDoc} - * @param hour {@inheritDoc} - * @param minute {@inheritDoc} - * @throws HtmlParseException {@inheritDoc} - */ - @Override - public void sysEventAskCommit(int hour, int minute) - throws HtmlParseException{ - this.integerList.add(hour * 60 + minute); - return; - } - - /** - * {@inheritDoc} - * @param content {@inheritDoc} - * @param avatarRange {@inheritDoc} - * @throws HtmlParseException {@inheritDoc} - */ - @Override - public void sysEventNoComment(DecodedContent content, - SeqRange avatarRange) - throws HtmlParseException{ - Avatar noComAvatar = toAvatar(content, avatarRange); - this.avatarList.add(noComAvatar); - return; - } - - /** - * {@inheritDoc} - * @param winner {@inheritDoc} - * @param hour {@inheritDoc} - * @param minute {@inheritDoc} - * @throws HtmlParseException {@inheritDoc} - */ - @Override - public void sysEventStayEpilogue(Team winner, int hour, int minute) - throws HtmlParseException{ - GameRole role = null; - - switch(winner){ - case VILLAGE: role = GameRole.INNOCENT; break; - case WOLF: role = GameRole.WOLF; break; - case HAMSTER: role = GameRole.HAMSTER; break; - default: assert false; break; - } - - this.roleList.add(role); - this.integerList.add(hour * 60 + minute); - - return; - } - - /** - * {@inheritDoc} - * @param content {@inheritDoc} - * @param guardByRange {@inheritDoc} - * @param guardToRange {@inheritDoc} - * @throws HtmlParseException {@inheritDoc} - */ - @Override - public void sysEventGuard(DecodedContent content, - SeqRange guardByRange, - SeqRange guardToRange) - throws HtmlParseException{ - Avatar guardBy = toAvatar(content, guardByRange); - Avatar guardTo = toAvatar(content, guardToRange); - this.avatarList.add(guardBy); - this.avatarList.add(guardTo); - return; - } - - /** - * {@inheritDoc} - * @param content {@inheritDoc} - * @param judgeByRange {@inheritDoc} - * @param judgeToRange {@inheritDoc} - * @throws HtmlParseException {@inheritDoc} - */ - @Override - public void sysEventJudge(DecodedContent content, - SeqRange judgeByRange, - SeqRange judgeToRange) - throws HtmlParseException{ - Avatar judgeBy = toAvatar(content, judgeByRange); - Avatar judgeTo = toAvatar(content, judgeToRange); - this.avatarList.add(judgeBy); - this.avatarList.add(judgeTo); - return; - } - - /** - * {@inheritDoc} - * @throws HtmlParseException {@inheritDoc} - */ - @Override - public void endSysEvent() throws HtmlParseException{ - SysEvent event = new SysEvent(); - event.setEventFamily(this.eventFamily); - event.setSysEventType(this.sysEventType); - event.setContent(this.eventContent); - event.addAvatarList(this.avatarList); - event.addRoleList(this.roleList); - event.addIntegerList(this.integerList); - event.addCharSequenceList(this.charseqList); - - this.period.addTopic(event); - - if( this.sysEventType == SysEventType.MURDERED - || this.sysEventType == SysEventType.NOMURDER ){ - for(Topic topic : this.period.topicList){ - if( ! (topic instanceof Talk) ) continue; - Talk talk = (Talk) topic; - if(talk.getTalkType() != TalkType.WOLFONLY) continue; - if( ! StringUtils - .isTerminated(talk.getDialog(), - "ï¼\u0020ä»æ¥ããåã®å½æ¥ã ï¼") ){ - continue; - } - talk.setCount(-1); - this.countMap.clear(); - } - } - - this.eventFamily = null; - this.sysEventType = null; - this.eventContent = null; - this.avatarList.clear(); - this.roleList.clear(); - this.integerList.clear(); - this.charseqList.clear(); - - return; - } - - /** - * {@inheritDoc} - * @throws HtmlParseException {@inheritDoc} - */ - @Override - public void endParse() throws HtmlParseException{ - return; - } - - // TODO æåã®ãã§ãã¯ã¯ä¸è¦ãï¼ - } - } diff --git a/src/main/java/jp/sfjp/jindolf/data/SysEvent.java b/src/main/java/jp/sfjp/jindolf/data/SysEvent.java index d9f44a6..bae4620 100644 --- a/src/main/java/jp/sfjp/jindolf/data/SysEvent.java +++ b/src/main/java/jp/sfjp/jindolf/data/SysEvent.java @@ -12,6 +12,7 @@ import java.util.HashSet; import java.util.LinkedList; import java.util.List; import java.util.Set; +import java.util.stream.Collectors; import jp.osdn.jindolf.parser.content.DecodedContent; import jp.sourceforge.jindolf.corelib.EventFamily; import jp.sourceforge.jindolf.corelib.GameRole; @@ -33,6 +34,13 @@ public class SysEvent implements Topic{ private final List integerList = new LinkedList<>(); private final List charseqList = new LinkedList<>(); + /** for playerList and onStage. */ + private final List playerList = new LinkedList<>(); + /** for execution. */ + private final List nominatedList = new LinkedList<>(); + /** for vote, judge, counting, etc. */ + private final List interPlayList = new LinkedList<>(); + /** * ã³ã³ã¹ãã©ã¯ã¿ã @@ -139,6 +147,39 @@ public class SysEvent implements Topic{ } /** + * Playerãªã¹ããè¿ãã + * + * @return Playerãªã¹ã + */ + public List getPlayerList(){ + List result = + Collections.unmodifiableList(this.playerList); + return result; + } + + /** + * Nominatedãªã¹ããè¿ãã + * + * @return Nominatedãªã¹ã + */ + public List getNominatedList(){ + List result = + Collections.unmodifiableList(this.nominatedList); + return result; + } + + /** + * InterPlayãªã¹ããè¿ãã + * + * @return InterPlayãªã¹ã + */ + public List getInterPlayList(){ + List result = + Collections.unmodifiableList(this.interPlayList); + return result; + } + + /** * Avatarä¸è¦§ãè¿½å ããã * @param list Avatarä¸è¦§ */ @@ -175,6 +216,35 @@ public class SysEvent implements Topic{ } /** + * Playerä¸è¦§ãè¿½å ããã + * + * @param list Playerä¸è¦§ + */ + public void addPlayerList(List list){ + this.playerList.addAll(list); + return; + } + + /** + * Nominatedä¸è¦§ãè¿½å ããã + * + * @param list Nominatedä¸è¦§ + */ + public void addNominatedList(List list){ + this.nominatedList.addAll(list); + return; + } + + /** + * InterPlayä¸è¦§ãè¿½å ããã + * @param list InterPlayä¸è¦§ + */ + public void addInterPlayList(List list){ + this.interPlayList.addAll(list); + return; + } + + /** * ã·ã¹ãã ã¤ãã³ããè§£æããå¦åãããAvatarãè¿ãã * Gå½éç¨ä¸ã®æç¹ã§ãå¦åèãåºãã®ã¯COUNTINGã¨EXECUTIONã®ã¿ã * @return å¦åãããAvatarãããªããã°null @@ -182,27 +252,11 @@ public class SysEvent implements Topic{ public Avatar getExecutedAvatar(){ Avatar result = null; - int avatarNum; - Avatar lastAvatar; - switch(this.sysEventType){ case COUNTING: - if(this.avatarList.isEmpty()) return null; - avatarNum = this.avatarList.size(); - if(avatarNum % 2 != 0){ - lastAvatar = this.avatarList.get(avatarNum - 1); - result = lastAvatar; - } - break; case EXECUTION: - if(this.avatarList.isEmpty()) return null; - avatarNum = this.avatarList.size(); - List intList = getIntegerList(); - int intNum = intList.size(); - assert intNum > 0; - if(avatarNum != intNum || intList.get(intNum - 1) <= 0){ - lastAvatar = this.avatarList.get(avatarNum - 1); - result = lastAvatar; + if( ! this.avatarList.isEmpty()){ + result = this.avatarList.get(0); } break; case COUNTING2: @@ -231,15 +285,11 @@ public class SysEvent implements Topic{ return result; } - int size = this.avatarList.size(); - assert size >= 2; - int limit = size - 1; - if(size % 2 != 0) limit--; + Set voterSet = this.interPlayList.stream() + .map(interPlay -> interPlay.getByWhom()) + .collect(Collectors.toSet()); - for(int idx = 0; idx <= limit; idx += 2){ - Avatar avatar = this.avatarList.get(idx); - result.add(avatar); - } + result.addAll(voterSet); return result; } diff --git a/src/main/java/jp/sfjp/jindolf/data/Talk.java b/src/main/java/jp/sfjp/jindolf/data/Talk.java index 7b966c3..c82db23 100644 --- a/src/main/java/jp/sfjp/jindolf/data/Talk.java +++ b/src/main/java/jp/sfjp/jindolf/data/Talk.java @@ -7,6 +7,9 @@ package jp.sfjp.jindolf.data; +import java.util.EnumMap; +import java.util.Map; +import java.util.Objects; import jp.sourceforge.jindolf.corelib.TalkType; /** @@ -14,20 +17,35 @@ import jp.sourceforge.jindolf.corelib.TalkType; */ public class Talk implements Topic{ + private static final String MEINICHI_LAST = + "ï¼\u0020ä»æ¥ããåã®å½æ¥ã ï¼"; + + private static final Map COLOR_MAP; + + static{ + COLOR_MAP = new EnumMap<>(TalkType.class); + COLOR_MAP.put(TalkType.PUBLIC, "ç½"); + COLOR_MAP.put(TalkType.PRIVATE, "ç°"); + COLOR_MAP.put(TalkType.WOLFONLY, "èµ¤"); + COLOR_MAP.put(TalkType.GRAVE, "é"); + } + + private final Period homePeriod; private final TalkType talkType; private final Avatar avatar; - private final int talkNo; private final String messageID; private final int hour; private final int minute; - private final CharSequence dialog; - private final int charNum; + private int charNum; + private int talkNo; + private CharSequence dialog; private int count = -1; /** * Talkã®çæã + * * @param homePeriod çºè¨åPeriod * @param talkType çºè¨ç¨®å¥ * @param avatar Avatar @@ -72,27 +90,49 @@ public class Talk implements Topic{ /** * ä¼è©±ç¨®å¥ããè²åã¸ã®å¤æãè¡ãã + * * @param type ä¼è©±ç¨®å¥ * @return è²å */ public static String encodeColorName(TalkType type){ - String result; + Objects.requireNonNull(type); + String result = COLOR_MAP.get(type); + return result; + } - switch(type){ - case PUBLIC: result = "ç½"; break; - case PRIVATE: result = "ç°"; break; - case WOLFONLY: result = "èµ¤"; break; - case GRAVE: result = "é"; break; - default: - assert false; - return null; + /** + * ããæååã®æ«å°¾ãå¥ã®æååã«ä¸è´ãããå¤å®ããã + * + * @param target å¤å®å¯¾è±¡ + * @param term æ«å°¾æå + * @return ä¸è´ããã°true + * @throws java.lang.NullPointerException å¼æ°ãnull + * @see String#endsWith(String) + */ + static boolean isTerminated(CharSequence target, + CharSequence term) + throws NullPointerException{ + Objects.requireNonNull(target); + Objects.requireNonNull(term); + + int targetLength = target.length(); + int termLength = term .length(); + + int offset = targetLength - termLength; + if(offset < 0) return false; + + for(int pos = 0; pos < termLength; pos++){ + char targetch = target.charAt(offset + pos); + char termch = term .charAt(0 + pos); + if(targetch != termch) return false; } - return result; + return true; } /** * çºè¨ãäº¤ããããPeriodãè¿ãã + * * @return Period */ public Period getPeriod(){ @@ -101,6 +141,7 @@ public class Talk implements Topic{ /** * çºè¨ç¨®å¥ãå¾ãã + * * @return ç¨®å¥ */ public TalkType getTalkType(){ @@ -109,6 +150,7 @@ public class Talk implements Topic{ /** * å¢ä¸çºè¨ãå¦ãå¤å®ããã + * * @return å¢ä¸çºè¨ãªãtrue */ public boolean isGrave(){ @@ -116,8 +158,10 @@ public class Talk implements Topic{ } /** - * çºè¨ç¨®å¥ãã¨ã«ãã®æ¥(Period)ã®ç´¯ç©çºè¨åæ°ãè¿ãã - * 1ããå§ã¾ãã + * åAvatarã®çºè¨ç¨®å¥ãã¨ã«ãã®æ¥(Period)ã®ç´¯ç©çºè¨åæ°ãè¿ãã + * + *

ã·ã¹ãã çæã®è¥²æäºåã®å ´åã¯è² ã®å¤ã¨ãªãã + * * @return ç´¯ç©çºè¨åæ°ã */ public int getTalkCount(){ @@ -126,7 +170,9 @@ public class Talk implements Topic{ /** * çºè¨æåæ°ãè¿ãã - * æ¹è¡(\n)ã¯1æåã + * + *

æ¹è¡(\n)ã¯1æåã + * * @return æåæ° */ public int getTotalChars(){ @@ -135,6 +181,7 @@ public class Talk implements Topic{ /** * çºè¨åAvatarãå¾ãã + * * @return çºè¨åAvatar */ public Avatar getAvatar(){ @@ -143,7 +190,9 @@ public class Talk implements Topic{ /** * å¬éçºè¨çªå·ãåå¾ããã - * å¬éçºè¨çªå·ãå²ãæ¯ããã¦ãªããã°0ä»¥ä¸ã®å¤ãè¿ãã + * + *

å¬éçºè¨çªå·ãå²ãæ¯ããã¦ãªããã°0ä»¥ä¸ã®å¤ãè¿ãã + * * @return å¬éçºè¨çªå· */ public int getTalkNo(){ @@ -151,7 +200,20 @@ public class Talk implements Topic{ } /** + * å¬éçºè¨çªå·ãè¨å®ããã + * + *

0ä»¥ä¸ã®å¤ã¯å¬éçºè¨çªå·ãæããªãã¨å¤æãããã + * + * @param talkNo å¬éçºè¨çªå· + */ + public void setTalkNo(int talkNo){ + this.talkNo = talkNo; + return; + } + + /** * å¬éçºè¨çªå·ã®æç¡ãè¿ãã + * * @return å¬éçºè¨çªå·ãå²ãå½ã¦ããã¦ãããªãtrueãè¿ãã */ public boolean hasTalkNo(){ @@ -161,6 +223,7 @@ public class Talk implements Topic{ /** * ã¡ãã»ã¼ã¸IDãåå¾ããã + * * @return ã¡ãã»ã¼ã¸ID */ public String getMessageID(){ @@ -169,6 +232,7 @@ public class Talk implements Topic{ /** * ã¡ãã»ã¼ã¸IDããã¨ããã¯ç§(ms)ã«å¤æããã + * * @return GMT 1970-01-01 00:00:00 ããã®ã¨ããã¯ç§(ms) */ public long getTimeFromID(){ @@ -179,6 +243,7 @@ public class Talk implements Topic{ /** * çºè¨æãåå¾ããã + * * @return çºè¨æ */ public int getHour(){ @@ -187,6 +252,7 @@ public class Talk implements Topic{ /** * çºè¨åãåå¾ããã + * * @return çºè¨å */ public int getMinute(){ @@ -195,6 +261,7 @@ public class Talk implements Topic{ /** * ä¼è©±ãã¼ã¿ãåå¾ããã + * * @return ä¼è©±ãã¼ã¿ */ public CharSequence getDialog(){ @@ -202,7 +269,21 @@ public class Talk implements Topic{ } /** + * ä¼è©±ãã¼ã¿ãè¨å®ããã + * + * @param seq ä¼è©±ãã¼ã¿ + */ + public void setDialog(CharSequence seq){ + this.dialog = seq; + this.charNum = this.dialog.length(); + return; + } + + /** * çºè¨ç¨®å¥ãã¨ã®çºè¨åæ°ãè¨å®ããã + * + *

ã·ã¹ãã çæã®è¥²æäºåã§ã¯è² ã®å¤ãå¥ããã°è¯ãã + * * @param count çºè¨åæ° */ public void setCount(int count){ @@ -212,7 +293,9 @@ public class Talk implements Topic{ /** * ãã®ä¼è©±ãèå¥ããããã®ã¢ã³ã«ã¼æååãçæããã - * ä¾ãã°ã3d09:56ããªã©ã + * + *

ä¾ãã°ã3d09:56ããªã©ã + * * @return ã¢ã³ã«ã¼æåå */ public String getAnchorNotation(){ @@ -228,7 +311,9 @@ public class Talk implements Topic{ /** * ãã®ä¼è©±ãèå¥ããããã®Gå½ç¨ã¢ã³ã«ã¼æååãçºè¨çªå·ããçæããã - * ä¾ãã°ã{@literal >>172}ããªã©ã + * + *

ä¾ãã°ã{@literal >>172}ããªã©ã + * * @return ã¢ã³ã«ã¼æååãçºè¨çªå·ããªããã°ç©ºæååã */ public String getAnchorNotation_G(){ @@ -237,23 +322,67 @@ public class Talk implements Topic{ } /** + * ä¼è©±ããã¹ãæ¬æãè¥²æäºåãããããå¤å®ããã + * + *

+ * {@link jp.sourceforge.jindolf.corelib.SysEventType#MURDERED} + * ãããã¯ + * {@link jp.sourceforge.jindolf.corelib.SysEventType#NOMURDER} + * ã®åã«è©²å½ããèµ¤ãã°ãåºç¾ããã°ãããã¯è¥²æäºåã¨æå®ãã¦è¯ãã + * + * @return è¥²æäºåã®ããã¹ãã®å¯è½æ§ããããªãtrue + */ + public boolean isMurderNotice(){ + boolean isWolf; + isWolf = this.talkType == TalkType.WOLFONLY; + if( ! isWolf) return false; + + boolean meinichida; + meinichida = isTerminated(getDialog(), MEINICHI_LAST); + if( ! meinichida) return false; + + return true; + } + + /** * {@inheritDoc} - * ä¼è©±ã®Stringè¡¨ç¾ãè¿ãã + * + *

ä¼è©±ã®Stringè¡¨ç¾ãè¿ãã * å®ä½åç§ãHTMLã¿ã°ãå«ã¾ããã + * * @return ä¼è©±ã®Stringè¡¨ç¾ */ @Override public String toString(){ - StringBuilder result = new StringBuilder(); - - result.append(this.avatar.getFullName()); - - if (this.talkType == TalkType.PUBLIC) result.append(" says "); - else if(this.talkType == TalkType.PRIVATE) result.append(" think "); - else if(this.talkType == TalkType.WOLFONLY) result.append(" howl "); - else if(this.talkType == TalkType.GRAVE) result.append(" groan "); + String fullName = this.avatar.getFullName(); + + String verb; + switch (this.talkType) { + case PUBLIC: + verb=" says "; + break; + case PRIVATE: + verb=" think "; + break; + case WOLFONLY: + verb=" howl "; + break; + case GRAVE: + verb=" groan "; + break; + default: + assert false; + return null; + } - result.append(this.dialog); + StringBuilder result = new StringBuilder(); + result.append(fullName).append(verb).append(this.dialog); return result.toString(); } diff --git a/src/main/java/jp/sfjp/jindolf/data/Village.java b/src/main/java/jp/sfjp/jindolf/data/Village.java index 79f23c7..7777aa9 100644 --- a/src/main/java/jp/sfjp/jindolf/data/Village.java +++ b/src/main/java/jp/sfjp/jindolf/data/Village.java @@ -7,53 +7,22 @@ package jp.sfjp.jindolf.data; -import java.awt.image.BufferedImage; -import java.io.IOException; -import java.text.MessageFormat; import java.util.Collections; -import java.util.Comparator; import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; -import java.util.logging.Level; -import java.util.logging.Logger; -import jp.osdn.jindolf.parser.HtmlAdapter; -import jp.osdn.jindolf.parser.HtmlParseException; -import jp.osdn.jindolf.parser.HtmlParser; -import jp.osdn.jindolf.parser.PageType; -import jp.osdn.jindolf.parser.SeqRange; -import jp.osdn.jindolf.parser.content.DecodedContent; -import jp.sfjp.jindolf.net.HtmlSequence; -import jp.sfjp.jindolf.net.ServerAccess; -import jp.sfjp.jindolf.util.GUIUtils; +import jp.sfjp.jindolf.view.AvatarPics; import jp.sourceforge.jindolf.corelib.LandDef; -import jp.sourceforge.jindolf.corelib.LandState; -import jp.sourceforge.jindolf.corelib.PeriodType; import jp.sourceforge.jindolf.corelib.VillageState; /** * ãããããæãã */ -public class Village implements Comparable { +public class Village{ private static final int GID_MIN = 3; - private static final Comparator VILLAGE_COMPARATOR = - new VillageComparator(); - - private static final HtmlParser PARSER = new HtmlParser(); - private static final VillageHeadHandler HANDLER = - new VillageHeadHandler(); - - private static final Logger LOGGER = Logger.getAnonymousLogger(); - - static{ - PARSER.setBasicHandler (HANDLER); - PARSER.setSysEventHandler(HANDLER); - PARSER.setTalkHandler (HANDLER); - } - private final Land parentLand; private final String villageID; @@ -76,18 +45,14 @@ public class Village implements Comparable { private final Map avatarMap = new HashMap<>(); - private final Map faceImageMap = - new HashMap<>(); - private final Map bodyImageMap = - new HashMap<>(); - private final Map faceMonoImageMap = - new HashMap<>(); - private final Map bodyMonoImageMap = - new HashMap<>(); + private final AvatarPics avatarPics; + + private boolean isLocalArchive = false; /** * Villageãçæããã + * * @param parentLand Villageã®æå±ããå½ * @param villageID æã®ID * @param villageName æã®åå @@ -101,51 +66,15 @@ public class Village implements Comparable { this.isValid = this.parentLand.getLandDef() .isValidVillageId(this.villageIDNum); - return; - } - - - /** - * æåå£«ãæ¯è¼ããããã®Comparatorãè¿ãã - * @return Comparatorã¤ã³ã¹ã¿ã³ã¹ - */ - public static Comparator comparator(){ - return VILLAGE_COMPARATOR; - } - - /** - * äººç¼BBSãµã¼ãããPeriodä¸è¦§æå ±ãå«ã¾ããHTMLãåå¾ãã - * Periodãªã¹ããæ´æ°ããã - * @param village æ - * @throws java.io.IOException ãããã¯ã¼ã¯å¥åºåã®ç°å¸¸ - */ - public static synchronized void updateVillage(Village village) - throws IOException{ - Land land = village.getParentLand(); - LandDef landDef = land.getLandDef(); - LandState landState = landDef.getLandState(); - ServerAccess server = land.getServerAccess(); - - HtmlSequence html; - if(landState == LandState.ACTIVE){ - html = server.getHTMLBoneHead(village); - }else{ - html = server.getHTMLVillage(village); - } - - DecodedContent content = html.getContent(); - HANDLER.setVillage(village); - try{ - PARSER.parseAutomatic(content); - }catch(HtmlParseException e){ - LOGGER.log(Level.WARNING, "æã®ç¶æãä¸æ", e); - } + this.avatarPics = new AvatarPics(this.parentLand); return; } + /** * æå±ããå½ãè¿ãã + * * @return æã®æå±ããå½ï¼Landï¼ */ public Land getParentLand(){ @@ -154,6 +83,7 @@ public class Village implements Comparable { /** * æã®IDæååãè¿ãã + * * @return æID */ public String getVillageID(){ @@ -162,6 +92,7 @@ public class Village implements Comparable { /** * æã®IDæ°å¤ãè¿ãã + * * @return æID */ public int getVillageIDNum(){ @@ -170,6 +101,7 @@ public class Village implements Comparable { /** * æã®ååãè¿ãã + * * @return æã®åå */ public String getVillageName(){ @@ -193,6 +125,7 @@ public class Village implements Comparable { /** * æã®é·ãååãè¿ãã + * * @return æã®é·ãåå */ public String getVillageFullName(){ @@ -201,6 +134,7 @@ public class Village implements Comparable { /** * æã®ç¶æãè¿ãã + * * @return æã®ç¶æ */ public VillageState getState(){ @@ -209,6 +143,7 @@ public class Village implements Comparable { /** * æã®ç¶æãè¨å®ããã + * * @param state æã®ç¶æ */ public void setState(VillageState state){ @@ -217,7 +152,18 @@ public class Village implements Comparable { } /** + * æ¥ç¨åã³æ´æ°æå»ãæã£ã¦ãããå¤å®ããã + * + * @return æ¥ç¨ãä¸æãªãtrue + */ + public boolean hasSchedule(){ + boolean result = ! this.periodList.isEmpty(); + return result; + } + + /** * ãããã¼ã°ãè¿ãã + * * @return ãããã¼ã° */ public Period getPrologue(){ @@ -229,6 +175,7 @@ public class Village implements Comparable { /** * ã¨ããã¼ã°ãè¿ãã + * * @return ã¨ããã¼ã° */ public Period getEpilogue(){ @@ -240,6 +187,7 @@ public class Village implements Comparable { /** * æå®ãããæ¥ä»ã®é²è¡æ¥ãè¿ãã + * * @param day æ¥ä» * @return Period */ @@ -253,6 +201,7 @@ public class Village implements Comparable { /** * PROGRESSç¶æã®Periodã®ç·æ°ãè¿ãã + * * @return PROGRESSç¶æã®Periodç·æ° */ public int getProgressDays(){ @@ -265,7 +214,9 @@ public class Village implements Comparable { /** * æå®ãããPeriodã¤ã³ããã¯ã¹ã®Periodãè¿ãã - * ãããã¼ã°ãã¨ããã¼ã°ã¸ã®ã¢ã¯ã»ã¹ãå¯è½ã + * + *

ãããã¼ã°ãã¨ããã¼ã°ã¸ã®ã¢ã¯ã»ã¹ãå¯è½ã + * * @param day Periodã¤ã³ããã¯ã¹ * @return Period */ @@ -275,6 +226,7 @@ public class Village implements Comparable { /** * æå®ãããã¢ã³ã«ã¼ã®å¯¾è±¡ã®Periodãè¿ãã + * * @param anchor ã¢ã³ã«ã¼ * @return Period */ @@ -294,6 +246,7 @@ public class Village implements Comparable { /** * Periodç·æ°ãè¿ãã + * * @return Periodç·æ° */ public int getPeriodSize(){ @@ -302,6 +255,7 @@ public class Village implements Comparable { /** * Periodã¸ã®ãªã¹ããè¿ãã + * * @return Periodã®ãªã¹ãã */ public List getPeriodList(){ @@ -309,163 +263,70 @@ public class Village implements Comparable { } /** - * æå®ããååã§æã«ç»é²ããã¦ããAvatarãè¿ãã + * æå®ãããã«ãã¼ã ã§æã«ç»é²ããã¦ããAvatarãè¿ãã + * * @param fullName Avatarã®åå * @return Avatar */ public Avatar getAvatar(String fullName){ - // TODO CharSequenceã«ã§ããªãï¼ - Avatar avatar; - - avatar = Avatar.getPredefinedAvatar(fullName); - if( avatar != null ){ - preloadAvatarFace(avatar); - return avatar; - } - - avatar = this.avatarMap.get(fullName); - if( avatar != null ){ - preloadAvatarFace(avatar); - return avatar; - } - - return null; - } - - /** - * Avatarã®é¡ç»åãäºåã«ãã¼ãããã - * @param avatar Avatar - */ - private void preloadAvatarFace(Avatar avatar){ - if(this.faceImageMap.get(avatar) != null) return; - - Land land = getParentLand(); - LandDef landDef = land.getLandDef(); - - String template = landDef.getFaceURITemplate(); - int serialNo = avatar.getIdNum(); - String uri = MessageFormat.format(template, serialNo); - - BufferedImage image = land.downloadImage(uri); - if(image == null) image = GUIUtils.getNoImage(); - - this.faceImageMap.put(avatar, image); - - return; + Avatar avatar = this.avatarMap.get(fullName); + return avatar; } /** * Avatarãæã«ç»é²ããã + * * @param avatar Avatar */ - // æªç¥ã®Avataråºç¾æã®å¦çãä¸å®å¨ public void addAvatar(Avatar avatar){ if(avatar == null) return; - String fullName = avatar.getFullName(); - this.avatarMap.put(fullName, avatar); - preloadAvatarFace(avatar); + String fullName = avatar.getFullName(); + if(this.avatarMap.get(fullName) != null) return; + this.avatarMap.put(fullName, avatar); return; } /** - * æã«ç»é²ãããAvatarã®é¡ã¤ã¡ã¼ã¸ãè¿ãã - * @param avatar Avatar - * @return é¡ã¤ã¡ã¼ã¸ - */ - // TODO å¤±æããããããã¼ã°ãå¼·å¶èªã¿è¾¼ã¿ãã¦åãã©ã¤ããã - public BufferedImage getAvatarFaceImage(Avatar avatar){ - return this.faceImageMap.get(avatar); - } - - /** - * æã«ç»é²ãããAvatarã®å¨èº«åã¤ã¡ã¼ã¸ãè¿ãã - * @param avatar Avatar - * @return å¨èº«ã¤ã¡ã¼ã¸ - */ - public BufferedImage getAvatarBodyImage(Avatar avatar){ - BufferedImage result; - result = this.bodyImageMap.get(avatar); - if(result != null) return result; - - Land land = getParentLand(); - LandDef landDef = land.getLandDef(); - - String template = landDef.getBodyURITemplate(); - int serialNo = avatar.getIdNum(); - String uri = MessageFormat.format(template, serialNo); - - result = land.downloadImage(uri); - if(result == null) result = GUIUtils.getNoImage(); - - this.bodyImageMap.put(avatar, result); - - return result; - } - - /** - * æã«ç»é²ãããAvatarã®ã¢ãã¯ãé¡ã¤ã¡ã¼ã¸ãè¿ãã - * @param avatar Avatar - * @return é¡ã¤ã¡ã¼ã¸ - */ - public BufferedImage getAvatarFaceMonoImage(Avatar avatar){ - BufferedImage result; - result = this.faceMonoImageMap.get(avatar); - if(result == null){ - result = getAvatarFaceImage(avatar); - result = GUIUtils.createMonoImage(result); - this.faceMonoImageMap.put(avatar, result); - } - return result; - } - - /** - * æã«ç»é²ãããAvatarã®å¨èº«åã¤ã¡ã¼ã¸ãè¿ãã - * @param avatar Avatar - * @return å¨èº«ã¤ã¡ã¼ã¸ - */ - public BufferedImage getAvatarBodyMonoImage(Avatar avatar){ - BufferedImage result; - result = this.bodyMonoImageMap.get(avatar); - if(result == null){ - result = getAvatarBodyImage(avatar); - result = GUIUtils.createMonoImage(result); - this.bodyMonoImageMap.put(avatar, result); - } - return result; - } - - /** - * å½ã«ç»é²ãããå¢ã¤ã¡ã¼ã¸ãè¿ãã - * @return å¢ã¤ã¡ã¼ã¸ + * Avatarç»åç®¡çãè¿ãã + * + * @return ç»åç®¡ç */ - public BufferedImage getGraveImage(){ - BufferedImage result = getParentLand().getGraveIconImage(); - return result; - } - - /** - * å½ã«ç»é²ãããå¢ã¤ã¡ã¼ã¸(å¤§)ãè¿ãã - * @return å¢ã¤ã¡ã¼ã¸(å¤§) - */ - public BufferedImage getGraveBodyImage(){ - BufferedImage result = getParentLand().getGraveBodyImage(); - return result; + public AvatarPics getAvatarPics(){ + return this.avatarPics; } /** * æã«ã¢ã¯ã»ã¹ããããã®CGIã¯ã¨ãªã¼ãè¿ãã + * * @return CGIã¯ã¨ãªã¼ */ - public CharSequence getCGIQuery(){ + public String getCGIQuery(){ StringBuilder result = new StringBuilder(); result.append("?vid=").append(getVillageID()); - return result; + return result.toString(); + } + + /** + * æ¬¡åæ´æ°æãè¨å®ããã + * + * @param month æ + * @param day æ¥ + * @param hour æ + * @param minute å + */ + public void setLimit(int month, int day, int hour, int minute){ + this.limitMonth = month; + this.limitDay = day; + this.limitHour = hour; + this.limitMinute = minute; + return; } /** * æ¬¡åæ´æ°æãè¿ãã + * * @return æ´æ°æ(1-12) */ public int getLimitMonth(){ @@ -474,6 +335,7 @@ public class Village implements Comparable { /** * æ¬¡åæ´æ°æ¥ãè¿ãã + * * @return æ´æ°æ¥(1-31) */ public int getLimitDay(){ @@ -482,6 +344,7 @@ public class Village implements Comparable { /** * æ¬¡åæ´æ°æãè¿ãã + * * @return æ´æ°æ(0-23) */ public int getLimitHour(){ @@ -490,6 +353,7 @@ public class Village implements Comparable { /** * æ¬¡åæ´æ°åãè¿ãã + * * @return æ´æ°å(0-59) */ public int getLimitMinute(){ @@ -498,6 +362,7 @@ public class Village implements Comparable { /** * æå¹ãªæãå¦ãå¤å®ããã + * * @return ç¡å¹ãªæãªãfalse */ public boolean isValid(){ @@ -506,13 +371,15 @@ public class Village implements Comparable { /** * Periodãªã¹ãã®æå®ããã¤ã³ããã¯ã¹ã«Periodãä¸æ¸ãããã - * ãªã¹ãã®ãµã¤ãºã¨åãã¤ã³ããã¯ã¹ãæå®ããäºãè¨±ãããã + * + *

ãªã¹ãã®ãµã¤ãºã¨åãã¤ã³ããã¯ã¹ãæå®ããäºãè¨±ãããã * ãã®å ´åã®åä½ã¯List.addã¨åãã + * * @param index Periodãªã¹ãã®ã¤ã³ããã¯ã¹ã * @param period ä¸æ¸ãããPeriod * @throws java.lang.IndexOutOfBoundsException ã¤ã³ããã¯ã¹ã®æå®ããããã */ - private void setPeriod(int index, Period period) + public void setPeriod(int index, Period period) throws IndexOutOfBoundsException{ int listSize = this.periodList.size(); if(index == listSize){ @@ -527,17 +394,16 @@ public class Village implements Comparable { /** * ã¢ã³ã«ã¼ã«ä¸è´ããä¼è©±(Talk)ã®ãªã¹ããåå¾ããã + * * @param anchor ã¢ã³ã«ã¼ * @return Talkã®ãªã¹ã - * @throws java.io.IOException ãããããããã¯ã¼ã¯ã¨ã©ã¼ */ - public List getTalkListFromAnchor(Anchor anchor) - throws IOException{ + public List getTalkListFromAnchor(Anchor anchor){ List result = new LinkedList<>(); /* Gå½ã¢ã³ã«ã¼å¯¾å¿ */ if(anchor.hasTalkNo()){ - // äºåã«å¨Periodããã¼ãããã¦ããã®ãåæ + // äºåã«å¨Periodã®å¨ä¼è©±ããã¼ãããã¦ããã®ãåæ for(Period period : this.periodList){ Talk talk = period.getNumberedTalk(anchor.getTalkNo()); if(talk == null) continue; @@ -549,7 +415,7 @@ public class Village implements Comparable { Period anchorPeriod = getPeriod(anchor); if(anchorPeriod == null) return result; - Period.parsePeriod(anchorPeriod, false); + // äºåã«ã¢ã³ã«ã¼å¯¾è±¡Periodã®å¨ä¼è©±ããã¼ãããã¦ããã®ãåæ for(Topic topic : anchorPeriod.getTopicList()){ if( ! (topic instanceof Talk) ) continue; @@ -572,52 +438,30 @@ public class Village implements Comparable { } /** - * {@inheritDoc} - * äºã¤ã®æãé åºä»ããã - * @param village {@inheritDoc} - * @return {@inheritDoc} + * ãã®æããã¼ã«ã«ãªã¢ã¼ã«ã¤ãã«ç±æ¥ãããã®ã§ãããå¤å®ããã + * + * @return ãã¼ã«ã«ãªã¢ã¼ã«ã¤ãã«ããæã§ããã°true */ - @Override - public int compareTo(Village village){ - int cmpResult = VILLAGE_COMPARATOR.compare(this, village); - return cmpResult; + public boolean isLocalArchive(){ + return this.isLocalArchive; } /** - * {@inheritDoc} - * äºã¤ã®æãçãããèª¿ã¹ãã - * @param obj {@inheritDoc} - * @return {@inheritDoc} + * ãã®æããã¼ã«ã«ãªã¢ã¼ã«ã¤ãã«ç±æ¥ãããã®ã§ãããè¨å®ããã + * + * @param flag ãã¼ã«ã«ãªã¢ã¼ã«ã¤ãã«ããæã§ããã°true */ - @Override - public boolean equals(Object obj){ - if(obj == null) return false; - if( ! (obj instanceof Village) ) return false; - Village village = (Village) obj; - - if( getParentLand() != village.getParentLand() ) return false; - - int cmpResult = compareTo(village); - if(cmpResult == 0) return true; - return false; - } - - /** - * {@inheritDoc} - * @return {@inheritDoc} - */ - @Override - public int hashCode(){ - int homeHash = getParentLand().hashCode(); - int vidHash = getVillageID().hashCode(); - int result = homeHash ^ vidHash; - return result; + public void setLocalArchive(boolean flag){ + this.isLocalArchive = flag; + return; } /** * {@inheritDoc} - * æã®æååè¡¨ç¾ãè¿ãã + * + *

æã®æååè¡¨ç¾ãè¿ãã * æã®ååã¨çããã + * * @return æã®åå */ @Override @@ -625,277 +469,4 @@ public class Village implements Comparable { return getVillageFullName(); } - - /** - * Periodä¸è¦§åå¾ç¨ãã³ãã©ã - */ - private static class VillageHeadHandler extends HtmlAdapter{ - - private Village village = null; - - private boolean hasPrologue; - private boolean hasProgress; - private boolean hasEpilogue; - private boolean hasDone; - private int maxProgress; - - /** - * ã³ã³ã¹ãã©ã¯ã¿ã - */ - public VillageHeadHandler(){ - super(); - return; - } - - /** - * æ´æ°å¯¾è±¡ã®æãè¨å®ããã - * @param village æ - */ - public void setVillage(Village village){ - this.village = village; - return; - } - - /** - * ãªã»ãããè¡ãã - */ - public void reset(){ - this.hasPrologue = false; - this.hasProgress = false; - this.hasEpilogue = false; - this.hasDone = false; - this.maxProgress = 0; - return; - } - - /** - * ãã¼ã¹çµæããæã®ç¶æãç®åºããã - * @return æã®ç¶æ - */ - public VillageState getVillageState(){ - if(this.hasDone){ - return VillageState.GAMEOVER; - }else if(this.hasEpilogue){ - return VillageState.EPILOGUE; - }else if(this.hasProgress){ - return VillageState.PROGRESS; - }else if(this.hasPrologue){ - return VillageState.PROLOGUE; - } - - return VillageState.UNKNOWN; - } - - /** - * {@inheritDoc} - * @param content {@inheritDoc} - * @throws HtmlParseException {@inheritDoc} - */ - @Override - public void startParse(DecodedContent content) - throws HtmlParseException{ - reset(); - return; - } - - /** - * {@inheritDoc} - * èªåå¤å®ã®çµæãæ¥ãã¼ã¸ã§ãªããã°ä¾å¤ãæããã - * @param type {@inheritDoc} - * @throws HtmlParseException {@inheritDoc} æå³ããªããã¼ã¸ãæ¥ãã - */ - @Override - public void pageType(PageType type) throws HtmlParseException{ - if(type != PageType.PERIOD_PAGE){ - throw new HtmlParseException( - "æ¥ãã¼ã¸ãå¿è¦ã§ãã"); - } - return; - } - - /** - * {@inheritDoc} - * @param month {@inheritDoc} - * @param day {@inheritDoc} - * @param hour {@inheritDoc} - * @param minute {@inheritDoc} - * @throws HtmlParseException {@inheritDoc} - */ - @Override - public void commitTime(int month, int day, - int hour, int minute) - throws HtmlParseException{ - this.village.limitMonth = month; - this.village.limitDay = day; - this.village.limitHour = hour; - this.village.limitMinute = minute; - - return; - } - - /** - * {@inheritDoc} - * @param content {@inheritDoc} - * @param anchorRange {@inheritDoc} - * @param periodType {@inheritDoc} - * @param day {@inheritDoc} - * @throws HtmlParseException {@inheritDoc} - */ - @Override - public void periodLink(DecodedContent content, - SeqRange anchorRange, - PeriodType periodType, - int day) - throws HtmlParseException{ - if(periodType == null){ - this.hasDone = true; - return; - } - - switch(periodType){ - case PROLOGUE: - this.hasPrologue = true; - break; - case PROGRESS: - this.hasProgress = true; - this.maxProgress = day; - break; - case EPILOGUE: - this.hasEpilogue = true; - break; - default: - assert false; - break; - } - - return; - } - - /** - * {@inheritDoc} - * @throws HtmlParseException {@inheritDoc} - */ - @Override - public void endParse() throws HtmlParseException{ - Land land = this.village.getParentLand(); - LandDef landDef = land.getLandDef(); - LandState landState = landDef.getLandState(); - - VillageState villageState = getVillageState(); - if(villageState == VillageState.UNKNOWN){ - this.village.setState(villageState); - this.village.periodList.clear(); - LOGGER.warning("æã®ç¶æ³ãèªã¿åãã¾ãã"); - return; - } - - if(landState == LandState.ACTIVE){ - this.village.setState(villageState); - }else{ - this.village.setState(VillageState.GAMEOVER); - } - - modifyPeriodList(); - - return; - } - - /** - * æ½åºãããªã³ã¯æå ±ã«ä¼´ãPeriodãªã¹ããæ´æ°ããã - * ã¾ã Periodãã¼ã¿ã®ãã¼ãã¯è¡ãããªãã - * ã²ã¼ã é²è¡ä¸ã®æã§æ´æ°æå»ãã¾ããã§æ´æ°ãè¡ãããå ´åã - * æ¢åã®Periodãªã¹ããä¼¸å¼µããå ´åãããã - */ - private void modifyPeriodList(){ - Period lastPeriod = null; - - if(this.hasPrologue){ - Period prologue = this.village.getPrologue(); - if(prologue == null){ - lastPeriod = new Period(this.village, - PeriodType.PROLOGUE, 0); - this.village.setPeriod(0, lastPeriod); - }else{ - lastPeriod = prologue; - } - } - - if(this.hasProgress){ - for(int day = 1; day <= this.maxProgress; day++){ - Period progress = this.village.getProgress(day); - if(progress == null){ - lastPeriod = new Period(this.village, - PeriodType.PROGRESS, day); - this.village.setPeriod(day, lastPeriod); - }else{ - lastPeriod = progress; - } - } - } - - if(this.hasEpilogue){ - Period epilogue = this.village.getEpilogue(); - if(epilogue == null){ - lastPeriod = new Period(this.village, - PeriodType.EPILOGUE, - this.maxProgress +1); - this.village.setPeriod(this.maxProgress +1, lastPeriod); - }else{ - lastPeriod = epilogue; - } - } - - assert this.village.getPeriodSize() > 0; - assert lastPeriod != null; - - // å¿µã®ãããã§ããã - // ãªãã¼ãã§æãç¸®ããããªãããããã¿ããªå¤§ããã ãªã - while(this.village.periodList.getLast() != lastPeriod){ - this.village.periodList.removeLast(); - } - - if(this.village.getState() != VillageState.GAMEOVER){ - lastPeriod.setHot(true); - } - - return; - } - - } - - - /** - * æåå£«ãæ¯è¼ããããã®Comparatorã - */ - private static class VillageComparator implements Comparator { - - /** - * ã³ã³ã¹ãã©ã¯ã¿ã - */ - public VillageComparator(){ - super(); - return; - } - - /** - * {@inheritDoc} - * @param v1 {@inheritDoc} - * @param v2 {@inheritDoc} - * @return {@inheritDoc} - */ - @Override - public int compare(Village v1, Village v2){ - int v1Num; - if(v1 == null) v1Num = Integer.MIN_VALUE; - else v1Num = v1.getVillageIDNum(); - - int v2Num; - if(v2 == null) v2Num = Integer.MIN_VALUE; - else v2Num = v2.getVillageIDNum(); - - return v1Num - v2Num; - } - - } - } diff --git a/src/main/java/jp/sfjp/jindolf/data/html/PeriodHandler.java b/src/main/java/jp/sfjp/jindolf/data/html/PeriodHandler.java new file mode 100644 index 0000000..114c2d6 --- /dev/null +++ b/src/main/java/jp/sfjp/jindolf/data/html/PeriodHandler.java @@ -0,0 +1,976 @@ +/* + * period handler + * + * License : The MIT License + * Copyright(c) 2020 olyutorskii + */ + +package jp.sfjp.jindolf.data.html; + +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import jp.osdn.jindolf.parser.EntityConverter; +import jp.osdn.jindolf.parser.HtmlAdapter; +import jp.osdn.jindolf.parser.HtmlParseException; +import jp.osdn.jindolf.parser.PageType; +import jp.osdn.jindolf.parser.SeqRange; +import jp.osdn.jindolf.parser.content.DecodedContent; +import jp.sfjp.jindolf.data.Avatar; +import jp.sfjp.jindolf.data.InterPlay; +import jp.sfjp.jindolf.data.Nominated; +import jp.sfjp.jindolf.data.Period; +import jp.sfjp.jindolf.data.Player; +import jp.sfjp.jindolf.data.SysEvent; +import jp.sfjp.jindolf.data.Talk; +import jp.sfjp.jindolf.data.Topic; +import jp.sfjp.jindolf.data.Village; +import jp.sourceforge.jindolf.corelib.Destiny; +import jp.sourceforge.jindolf.corelib.EventFamily; +import jp.sourceforge.jindolf.corelib.GameRole; +import jp.sourceforge.jindolf.corelib.PeriodType; +import jp.sourceforge.jindolf.corelib.SysEventType; +import jp.sourceforge.jindolf.corelib.TalkType; +import jp.sourceforge.jindolf.corelib.Team; + + +/** + * åæ¥(Period)ã®HTMLããã¼ã¹ãã + * ä¼è©±ãã¤ãã³ãã®éç¥ãåãåãããã®ãã³ãã©ã + * + *

åç¨®ãã¥ã¼ãå¯¾å¿ããã¾ã§ã®éãUnicodeã®éBMPé¢æåã«ã¯ä»£æ¿æåã§å¯¾å¦ã + * + *

â» äººç¼BBS:Gå½ã«ãããG2087æã®ã¨ããã¼ã°ãçµäºããæ®µéã§ã + * äººç¼BBSã¯éå»ãã°ã®æä¾ããè¡ã£ã¦ããªãã + * ã ããã®ã¯ã©ã¹ã«ã¯é²è¡ä¸ã®æã®åæ¥ããã¼ã¹ããããã® + * åé·ãªå¦çãè¥å¹²æ®ã£ã¦ããã + */ +class PeriodHandler extends HtmlAdapter { + + private static final int TALKTYPE_NUM = TalkType.values().length; + + private final EntityConverter converter = + new EntityConverter(true); + // TODO: éBMPé¢æåã«å¯¾å¿ããã¾ã§ã®æ«å®æªç½® + + /** éå¥ãAvatarå¥ãä¼è©±ç¨®å¥ã®ä¼è©±éãçªå·ã */ + private final Map countMap = + new HashMap<>(); + + private Period period = null; + + private TalkType talkType; + private Avatar avatar; + private int talkNo; + private String anchorId; + private int talkHour; + private int talkMinute; + private DecodedContent talkContent = null; + + private EventFamily eventFamily; + private SysEventType sysEventType; + private DecodedContent eventContent = null; + private final List avatarList = new LinkedList<>(); + private final List roleList = new LinkedList<>(); + private final List integerList = new LinkedList<>(); + private final List charseqList = + new LinkedList<>(); + private final List playerList = new LinkedList<>(); + private final List nominatedList = new LinkedList<>(); + private final List interPlayList = new LinkedList<>(); + + + /** + * ã³ã³ã¹ãã©ã¯ã¿ã + */ + PeriodHandler(){ + super(); + return; + } + + + /** + * æ´æ°å¯¾è±¡ã®Periodãè¨å®ããã + * + * @param period Period + */ + void setPeriod(Period period){ + this.period = period; + reset(); + return; + } + + /** + * ãã«ãã¼ã æååããAvatarã¤ã³ã¹ã¿ã³ã¹ãå¾ãã + * + *

æã«æªç»é²ã®Avatarã§ããã°ã¤ãã§ã«ç»é²ãããã + * + * @param content æåå + * @param range æåååã®Avatarãã«ãã¼ã ãç¤ºãé å + * @return Avatar + */ + private Avatar toAvatar(DecodedContent content, SeqRange range){ + Village village = this.period.getVillage(); + String fullName = this.converter + .convert(content, range) + .toString(); + Avatar result = village.getAvatar(fullName); + if(result == null){ + result = Avatar.getAvatarByFullname(fullName); + village.addAvatar(result); + } + + return result; + } + + /** + * ãã¼ã¹ä¸ã®åç¨®ã³ã³ããã¹ãããªã»ããããã + */ + void reset(){ + this.countMap.clear(); + + resetTalkContext(); + resetEventContext(); + + return; + } + + /** + * ãã¼ã¹ä¸ã®ä¼è©±ã³ã³ããã¹ãããªã»ããããã + */ + private void resetTalkContext(){ + this.talkType = null; + this.avatar = null; + this.talkNo = -1; + this.anchorId = null; + this.talkHour = -1; + this.talkMinute = -1; + this.talkContent = null; + return; + } + + /** + * ãã¼ã¹ä¸ã®ã¤ãã³ãã³ã³ããã¹ãããªã»ããããã + */ + private void resetEventContext(){ + this.eventFamily = null; + this.sysEventType = null; + this.eventContent = null; + this.avatarList.clear(); + this.roleList.clear(); + this.integerList.clear(); + this.charseqList.clear(); + this.playerList.clear(); + this.nominatedList.clear(); + this.interPlayList.clear(); + return; + } + + /** + * {@inheritDoc} + * + * @param content {@inheritDoc} + * @throws HtmlParseException {@inheritDoc} + */ + @Override + public void startParse(DecodedContent content) + throws HtmlParseException{ + reset(); + + this.period.clearTopicList(); + + return; + } + + /** + * {@inheritDoc} + * + *

åPeriodã®HTMLä¸é¨ã«ãããã°ã¤ã³åãéç¥ãããã®ãªãã + * ããã¯POSTãCookieãä½¿ã£ã¦ã®ãã°ã¤ã³ã«æåããã¨è¨ããã¨ã + * + *

ãã°ã¤ã³åä¸ã®æåå®ä½åç§ã¯å±éãããã + * + *

â» 2020-02ç¾å¨ãäººç¼BBSåå½ã¸ã®ãã°ã¤ã³ã¯ç¡æå³ã + * + * @param content {@inheritDoc} + * @param loginRange {@inheritDoc} + * @throws HtmlParseException {@inheritDoc} + */ + @Override + public void loginName(DecodedContent content, SeqRange loginRange) + throws HtmlParseException{ + return; + } + + /** + * {@inheritDoc} + * + *

åä¿¡ããHTMLãPeriodãã¼ã¸ã§ãªãã®ãªããã¼ã¹ãä¸æ¢ããã + * + * @param type {@inheritDoc} + * @throws HtmlParseException {@inheritDoc} + */ + @Override + public void pageType(PageType type) throws HtmlParseException{ + if(type != PageType.PERIOD_PAGE){ + throw new HtmlParseException( + "æå³ããªããã¼ã¸ãèªã¿è¾¼ããã¨ãã¾ããã"); + } + return; + } + + /** + * {@inheritDoc} + * + *

ææ¥ã®éç¥ã¯ç¡è¦ãããã + * + * @param month {@inheritDoc} + * @param day {@inheritDoc} + * @param hour {@inheritDoc} + * @param minute {@inheritDoc} + * @throws HtmlParseException {@inheritDoc} + */ + @Override + public void commitTime(int month, int day, int hour, int minute) + throws HtmlParseException{ + this.period.setLimit(hour, minute); + return; + } + + /** + * {@inheritDoc} + * + *

ãã®Periodãé²è¡ä¸(Hot!)ãå¦ãå¤å®ããã + * + *

Periodã®HTMLåã«èªåèªèº«ã¸ã®ãªã³ã¯ãç¡ãããã§ãã¯ããã + * èªåã¸ã®ãªã³ã¯ãè¦ã¤ããã°ãã®PeriodãéHotã«ããã + * èªåã¸ã®ãªã³ã¯ãããã¨ãããã¨ã¯ã + * ä»åä¿¡ãã¦ããHTMLã¯å¥ã®Periodããè¾¿ãããã«æ¸ããããã®ã¨ãããã¨ã + * + *

åå ã¨ãã¦ã¯ãHotã ã£ãPeriodãã²ã¼ã é²è¡ã«å¾ã + * Hotã§ãªããªã£ããã¨ãªã©ãèããããã + * + *

åPeriodã®ç¨®å¥ã¨æ¥ã¯ã + * ææå ±åä¿¡ãéãã¦äºåã«è¨å®ããã¦ããªããã°ãªããªãã + * + *

â» 2020-02ç¾å¨ãHotãªPeriodãåä¿¡ããæ©ä¼ã¯ãªãã¯ãã + * + * @param content {@inheritDoc} + * @param anchorRange {@inheritDoc} + * @param periodType {@inheritDoc} + * @param day {@inheritDoc} + * @throws HtmlParseException {@inheritDoc} + */ + @Override + public void periodLink(DecodedContent content, + SeqRange anchorRange, + PeriodType periodType, + int day ) + throws HtmlParseException{ + if(this.period.getType() != periodType) return; + + boolean isProgress = periodType == PeriodType.PROGRESS; + boolean dayMatch = this.period.getDay() == day; + if(isProgress && ! dayMatch){ + return; + } + + if( ! anchorRange.isValid() ) return; + + return; + } + + /** + * {@inheritDoc} + * + * @throws HtmlParseException {@inheritDoc} + */ + @Override + public void startTalk() throws HtmlParseException{ + resetTalkContext(); + this.talkContent = new DecodedContent(100 + 1); + return; + } + + /** + * {@inheritDoc} + * + * @param type {@inheritDoc} + * @throws HtmlParseException {@inheritDoc} + */ + @Override + public void talkType(TalkType type) + throws HtmlParseException{ + this.talkType = type; + return; + } + + /** + * {@inheritDoc} + * + * @param content {@inheritDoc} + * @param avatarRange {@inheritDoc} + * @throws HtmlParseException {@inheritDoc} + */ + @Override + public void talkAvatar(DecodedContent content, SeqRange avatarRange) + throws HtmlParseException{ + this.avatar = toAvatar(content, avatarRange); + return; + } + + /** + * {@inheritDoc} + * + * @param hour {@inheritDoc} + * @param minute {@inheritDoc} + * @throws HtmlParseException {@inheritDoc} + */ + @Override + public void talkTime(int hour, int minute) + throws HtmlParseException{ + this.talkHour = hour; + this.talkMinute = minute; + return; + } + + /** + * {@inheritDoc} + * + * @param tno {@inheritDoc} + * @throws HtmlParseException {@inheritDoc} + */ + @Override + public void talkNo(int tno) throws HtmlParseException{ + this.talkNo = tno; + return; + } + + /** + * {@inheritDoc} + * + * @param content {@inheritDoc} + * @param idRange {@inheritDoc} + * @throws HtmlParseException {@inheritDoc} + */ + @Override + public void talkId(DecodedContent content, SeqRange idRange) + throws HtmlParseException{ + this.anchorId = content.subSequence(idRange.getStartPos(), + idRange.getEndPos() ) + .toString(); + return; + } + + /** + * {@inheritDoc} + * + *

ä¼è©±ä¸ã®æåå®ä½åç§ã¯å±éãããã + * + * @param content {@inheritDoc} + * @param textRange {@inheritDoc} + * @throws HtmlParseException {@inheritDoc} + */ + @Override + public void talkText(DecodedContent content, SeqRange textRange) + throws HtmlParseException{ + this.converter.append(this.talkContent, content, textRange); + return; + } + + /** + * {@inheritDoc} + * + * @throws HtmlParseException {@inheritDoc} + */ + @Override + public void talkBreak() + throws HtmlParseException{ + this.talkContent.append('\n'); + return; + } + + /** + * æ¥å¥ãAvatarå¥ãä¼è©±ç¨®ãã¨ã«çºè¨åæ°ãã¤ã³ã¯ãªã¡ã³ãããã + * + * @param targetAvatar å¯¾è±¡Avatar + * @param targetType å¯¾è±¡ä¼è©±ç¨® + * @return ç¾æç¹ã§ã®ã«ã¦ã³ãæ° + */ + private int countUp(Avatar targetAvatar, TalkType targetType){ + int[] avatarCount = this.countMap.get(targetAvatar); + if(avatarCount == null){ + avatarCount = new int[TALKTYPE_NUM]; + this.countMap.put(targetAvatar, avatarCount); + } + + int typeIdx = targetType.ordinal(); + int count = ++avatarCount[typeIdx]; + + return count; + } + + /** + * {@inheritDoc} + * + *

ãã¼ã¹ä¸ã®åç¨®ã³ã³ããã¹ãããä¼è©±ãçµã¿ç«ã¦ã + * Periodã«è¿½å ããã + * + * @throws HtmlParseException {@inheritDoc} + */ + @Override + public void endTalk() throws HtmlParseException{ + Talk talk = new Talk(this.period, + this.talkType, + this.avatar, + this.talkNo, + this.anchorId, + this.talkHour, this.talkMinute, + this.talkContent ); + + int count = countUp(this.avatar, this.talkType); + talk.setCount(count); + + this.period.addTopic(talk); + + resetTalkContext(); + + return; + } + + /** + * {@inheritDoc} + * + * @param family {@inheritDoc} + * @throws HtmlParseException {@inheritDoc} + */ + @Override + public void startSysEvent(EventFamily family) + throws HtmlParseException{ + resetEventContext(); + + this.eventFamily = family; + this.eventContent = new DecodedContent(); + + return; + } + + /** + * {@inheritDoc} + * + * @param type {@inheritDoc} + * @throws HtmlParseException {@inheritDoc} + */ + @Override + public void sysEventType(SysEventType type) + throws HtmlParseException{ + this.sysEventType = type; + return; + } + + /** + * {@inheritDoc} + * + *

ã¤ãã³ãæååä¸ã®æåå®ä½åç§ã¯å±éãããã + * + * @param content {@inheritDoc} + * @param contentRange {@inheritDoc} + * @throws HtmlParseException {@inheritDoc} + */ + @Override + public void sysEventContent(DecodedContent content, + SeqRange contentRange) + throws HtmlParseException{ + this.converter.append(this.eventContent, content, contentRange); + return; + } + + /** + * {@inheritDoc} + * + *

ã¤ãã³ãæåAã¿ã°åå®¹ã®æåå®ä½åç§ã¯å±éãããã + * HREFå±æ§å¤ã¯ç¡è¦ããã + * + * @param content {@inheritDoc} + * @param anchorRange {@inheritDoc} + * @param contentRange {@inheritDoc} + * @throws HtmlParseException {@inheritDoc} + */ + @Override + public void sysEventContentAnchor(DecodedContent content, + SeqRange anchorRange, + SeqRange contentRange) + throws HtmlParseException{ + this.converter.append(this.eventContent, content, contentRange); + return; + } + + /** + * {@inheritDoc} + * + * @throws HtmlParseException {@inheritDoc} + */ + @Override + public void sysEventContentBreak() throws HtmlParseException{ + this.eventContent.append('\n'); + return; + } + + /** + * {@inheritDoc} + * + *

Avatarãªã¹ãã®åé ã«Avatarãã + * intãªã¹ãã®åé ã«ã¨ã³ããªã¼çªå·ãå¥ãã + * + * @param content {@inheritDoc} + * @param entryNo {@inheritDoc} + * @param avatarRange {@inheritDoc} + * @throws HtmlParseException {@inheritDoc} + */ + @Override + public void sysEventOnStage(DecodedContent content, + int entryNo, + SeqRange avatarRange) + throws HtmlParseException{ + Avatar newAvatar = toAvatar(content, avatarRange); + Player player = new Player(); + player.setAvatar(newAvatar); + player.setEntryNo(entryNo); + this.playerList.add(player); + return; + } + + /** + * {@inheritDoc} + * + *

å½¹è·èæ°éç¤ºã«ä¼´ãå½¹è·ãªã¹ãã¨intãªã¹ãã«ä¸ä»¶ãã¤è¿½å ãããã + * + * @param role {@inheritDoc} + * @param num {@inheritDoc} + * @throws HtmlParseException {@inheritDoc} + */ + @Override + public void sysEventOpenRole(GameRole role, int num) + throws HtmlParseException{ + this.roleList.add(role); + this.integerList.add(num); + return; + } + + /** + * {@inheritDoc} + * + *

åã¿åã³ãã æº¶ãã«ä¼´ãAvatarãªã¹ãã«1ä»¶ãã¤è¿½å ãããã + * + * @param content {@inheritDoc} + * @param avatarRange {@inheritDoc} + * @throws HtmlParseException {@inheritDoc} + */ + @Override + public void sysEventMurdered(DecodedContent content, + SeqRange avatarRange) + throws HtmlParseException{ + Avatar murdered = toAvatar(content, avatarRange); + this.avatarList.add(murdered); + return; + } + + /** + * {@inheritDoc} + * + *

çåèè¡¨ç¤ºã«ä¼´ãAvatarãªã¹ãã«1ä»¶ãã¤è¿½å ãããã + * + * @param content {@inheritDoc} + * @param avatarRange {@inheritDoc} + * @throws HtmlParseException {@inheritDoc} + */ + @Override + public void sysEventSurvivor(DecodedContent content, + SeqRange avatarRange) + throws HtmlParseException{ + Avatar survivor = toAvatar(content, avatarRange); + this.avatarList.add(survivor); + return; + } + + /** + * {@inheritDoc} + * + *

Gå½ä»¥å¤ã§ã®å¦åã«ä¼´ãã + * æç¥¨åã¨æç¥¨åã®é ã§Avatarãªã¹ãã«è¿½å ãããã + * + *

è¢«å¦åèãããã°Avatarãªã¹ãã®æå¾ã«è¿½å ãããã + * + * @param content {@inheritDoc} + * @param voteByRange {@inheritDoc} + * @param voteToRange {@inheritDoc} + * @throws HtmlParseException {@inheritDoc} + */ + @Override + public void sysEventCounting(DecodedContent content, + SeqRange voteByRange, + SeqRange voteToRange) + throws HtmlParseException{ + if( ! voteByRange.isValid()){ + Avatar victim = toAvatar(content, voteToRange); + this.avatarList.add(victim); + return; + } + + Avatar voteBy = toAvatar(content, voteByRange); + Avatar voteTo = toAvatar(content, voteToRange); + + InterPlay interPlay = new InterPlay(voteBy, voteTo); + this.interPlayList.add(interPlay); + + return; + } + + /** + * {@inheritDoc} + * + *

Gå½å¦åã«ä¼´ãã + * æç¥¨åã¨æç¥¨åã®é ã§Avatarãªã¹ãã«è¿½å ãããã + * + * @param content {@inheritDoc} + * @param voteByRange {@inheritDoc} + * @param voteToRange {@inheritDoc} + * @throws HtmlParseException {@inheritDoc} + */ + @Override + public void sysEventCounting2(DecodedContent content, + SeqRange voteByRange, + SeqRange voteToRange) + throws HtmlParseException{ + sysEventCounting(content, voteByRange, voteToRange); + return; + } + + /** + * {@inheritDoc} + * + *

Avatarãªã¹ãã®åé ã«çªç¶æ»èãå¥ãã + * + * @param content {@inheritDoc} + * @param avatarRange {@inheritDoc} + * @throws HtmlParseException {@inheritDoc} + */ + @Override + public void sysEventSuddenDeath(DecodedContent content, + SeqRange avatarRange) + throws HtmlParseException{ + Avatar suddenDeath = toAvatar(content, avatarRange); + this.avatarList.add(suddenDeath); + return; + } + + /** + * {@inheritDoc} + * + * @param content {@inheritDoc} + * @param avatarRange {@inheritDoc} + * @throws HtmlParseException {@inheritDoc} + */ + @Override + public void sysEventCheckout(DecodedContent content, + SeqRange avatarRange) + throws HtmlParseException { + Avatar checkouted = toAvatar(content, avatarRange); + this.avatarList.add(checkouted); + return; + } + + /** + * {@inheritDoc} + * + * @param content {@inheritDoc} + * @param avatarRange {@inheritDoc} + * @throws HtmlParseException {@inheritDoc} + */ + @Override + public void sysEventVanish(DecodedContent content, + SeqRange avatarRange) + throws HtmlParseException { + Avatar vanished = toAvatar(content, avatarRange); + this.avatarList.add(vanished); + return; + } + + /** + * {@inheritDoc} + * + *

ãã¬ã¤ã¤ã¼æå ±éç¤ºã«ä¼´ãã + * Avatarãªã¹ãã«1ä»¶ã + * æååãªã¹ãã«URLã¨ãã¬ã¤ã¤ã¼åã®2ä»¶ã + * intãªã¹ãã«çæ»(1or0)ã1ä»¶ã + * Roleãªã¹ãã«å½¹è·ã1ä»¶è¿½å ãããã + * + * @param content {@inheritDoc} + * @param avatarRange {@inheritDoc} + * @param anchorRange {@inheritDoc} + * @param loginRange {@inheritDoc} + * @param isLiving {@inheritDoc} + * @param role {@inheritDoc} + * @throws HtmlParseException {@inheritDoc} + */ + @Override + public void sysEventPlayerList(DecodedContent content, + SeqRange avatarRange, + SeqRange anchorRange, + SeqRange loginRange, + boolean isLiving, + GameRole role ) + throws HtmlParseException{ + Avatar who = toAvatar(content, avatarRange); + + CharSequence anchor; + if(anchorRange.isValid()){ + anchor = this.converter.convert(content, anchorRange); + }else{ + anchor = ""; + } + CharSequence account = this.converter + .convert(content, loginRange); + + Player player = new Player(); + + player.setAvatar(who); + player.setRole(role); + player.setIdName(account.toString()); + player.setUrlText(anchor.toString()); + if(isLiving){ + player.setObitDay(-1); + player.setDestiny(Destiny.ALIVE); + } + + this.playerList.add(player); + + return; + } + + /** + * {@inheritDoc} + * + *

Gå½å¦åã«ä¼´ããè¢«å¦åèãããã°Avatarãªã¹ãã«1ä»¶è¿½å ãããã + * + * @param content {@inheritDoc} + * @param avatarRange {@inheritDoc} + * @param votes {@inheritDoc} + * @throws HtmlParseException {@inheritDoc} + */ + @Override + public void sysEventExecution(DecodedContent content, + SeqRange avatarRange, + int votes ) + throws HtmlParseException{ + Avatar who = toAvatar(content, avatarRange); + + if(votes <= 0){ + this.avatarList.add(who); + }else{ + Nominated nominated = new Nominated(who, votes); + this.nominatedList.add(nominated); + } + + return; + } + + /** + * {@inheritDoc} + * + *

ã¨ã³ããªã¼ä¿ãã«ä¼´ãã + * intãªã¹ãã«åæ°ãæå°ã¡ã³ãæ°ãæå¤§ã¡ã³ãæ°ã®3ä»¶ãè¨å®ãããã + * + * @param hour {@inheritDoc} + * @param minute {@inheritDoc} + * @param minLimit {@inheritDoc} + * @param maxLimit {@inheritDoc} + * @throws HtmlParseException {@inheritDoc} + */ + @Override + public void sysEventAskEntry(int hour, int minute, + int minLimit, int maxLimit) + throws HtmlParseException{ + this.integerList.add(hour * 60 + minute); + this.integerList.add(minLimit); + this.integerList.add(maxLimit); + return; + } + + /** + * {@inheritDoc} + * + *

ã¨ã³ããªã¼å®äºã«ä¼´ããåæ°ãintãªã¹ãã«è¨å®ããã + * + * @param hour {@inheritDoc} + * @param minute {@inheritDoc} + * @throws HtmlParseException {@inheritDoc} + */ + @Override + public void sysEventAskCommit(int hour, int minute) + throws HtmlParseException{ + this.integerList.add(hour * 60 + minute); + return; + } + + /** + * {@inheritDoc} + * + *

æªçºè¨èä¸è¦§ã«ä¼´ãã + * æªçºè¨èã¯Avatarãªã¹ãã¸1ä»¶ãã¤è¿½å ãããã + * + * @param content {@inheritDoc} + * @param avatarRange {@inheritDoc} + * @throws HtmlParseException {@inheritDoc} + */ + @Override + public void sysEventNoComment(DecodedContent content, + SeqRange avatarRange) + throws HtmlParseException{ + Avatar noComAvatar = toAvatar(content, avatarRange); + this.avatarList.add(noComAvatar); + return; + } + + /** + * {@inheritDoc} + * + *

æ±ºççºè¡¨ã«ä¼´ãã + * Roleãªã¹ãã«åèã1ä»¶ãintãªã¹ãåæ°ã1ä»¶è¨å®ãããã + * + *

æåå©ã®å ´åã¯ç´ æå½¹è·ãç¨ããããã + * + * @param winner {@inheritDoc} + * @param hour {@inheritDoc} + * @param minute {@inheritDoc} + * @throws HtmlParseException {@inheritDoc} + */ + @Override + public void sysEventStayEpilogue(Team winner, int hour, int minute) + throws HtmlParseException{ + GameRole role = null; + + switch(winner){ + case VILLAGE: role = GameRole.INNOCENT; break; + case WOLF: role = GameRole.WOLF; break; + case HAMSTER: role = GameRole.HAMSTER; break; + default: assert false; break; + } + + this.roleList.add(role); + this.integerList.add(hour * 60 + minute); + + return; + } + + /** + * {@inheritDoc} + * + *

è·è¡ã«ä¼´ããAvatarãªã¹ãã«è·è¡å1ä»¶ã¨è·è¡å1ä»¶ãè¨å®ãããã + * + * @param content {@inheritDoc} + * @param guardByRange {@inheritDoc} + * @param guardToRange {@inheritDoc} + * @throws HtmlParseException {@inheritDoc} + */ + @Override + public void sysEventGuard(DecodedContent content, + SeqRange guardByRange, + SeqRange guardToRange) + throws HtmlParseException{ + Avatar guardBy = toAvatar(content, guardByRange); + Avatar guardTo = toAvatar(content, guardToRange); + InterPlay interPlay = new InterPlay(guardBy, guardTo); + this.interPlayList.add(interPlay); + return; + } + + /** + * {@inheritDoc} + * + *

å ãã«ä¼´ãã + * å ãåã1ä»¶ãå ãåã1ä»¶Avatarãªã¹ãã«è¨å®ãããã + * + * @param content {@inheritDoc} + * @param judgeByRange {@inheritDoc} + * @param judgeToRange {@inheritDoc} + * @throws HtmlParseException {@inheritDoc} + */ + @Override + public void sysEventJudge(DecodedContent content, + SeqRange judgeByRange, + SeqRange judgeToRange) + throws HtmlParseException{ + Avatar judgeBy = toAvatar(content, judgeByRange); + Avatar judgeTo = toAvatar(content, judgeToRange); + InterPlay interPlay = new InterPlay(judgeBy, judgeTo); + this.interPlayList.add(interPlay); + return; + } + + /** + * {@inheritDoc} + * + *

è¥²æãããã¯è¥²æãªãã®ã¤ãã³ãã®åã«ã + * ãä»æ¥ããåã®å½æ¥ã ï¼ãã§çµããèµ¤ãã°ãåºç¾ããå ´åã + * èµ¤ã«ã¦ã³ãã«å«ããªãã + * + * @throws HtmlParseException {@inheritDoc} + */ + @Override + public void endSysEvent() throws HtmlParseException{ + SysEvent event = new SysEvent(); + event.setEventFamily(this.eventFamily); + event.setSysEventType(this.sysEventType); + event.setContent(this.eventContent); + event.addAvatarList(this.avatarList); + event.addRoleList(this.roleList); + event.addIntegerList(this.integerList); + event.addCharSequenceList(this.charseqList); + event.addPlayerList(this.playerList); + event.addNominatedList(this.nominatedList); + event.addInterPlayList(this.interPlayList); + + this.period.addTopic(event); + + boolean isMurderResult = + this.sysEventType == SysEventType.MURDERED + || this.sysEventType == SysEventType.NOMURDER; + + if(isMurderResult){ + for(Topic topic : this.period.getTopicList()){ + if( ! (topic instanceof Talk) ) continue; + Talk talk = (Talk) topic; + if(talk.isMurderNotice()){ + talk.setCount(-1); + this.countMap.clear(); + break; + } + } + } + + resetEventContext(); + + return; + } + + /** + * {@inheritDoc} + * + * @throws HtmlParseException {@inheritDoc} + */ + @Override + public void endParse() throws HtmlParseException{ + reset(); + return; + } + +} diff --git a/src/main/java/jp/sfjp/jindolf/data/html/PeriodLoader.java b/src/main/java/jp/sfjp/jindolf/data/html/PeriodLoader.java new file mode 100644 index 0000000..a024919 --- /dev/null +++ b/src/main/java/jp/sfjp/jindolf/data/html/PeriodLoader.java @@ -0,0 +1,82 @@ +/* + * period loader + * + * License : The MIT License + * Copyright(c) 2020 olyutorskii + */ + +package jp.sfjp.jindolf.data.html; + +import java.io.IOException; +import java.util.logging.Level; +import java.util.logging.Logger; +import jp.osdn.jindolf.parser.HtmlParseException; +import jp.osdn.jindolf.parser.HtmlParser; +import jp.osdn.jindolf.parser.content.DecodedContent; +import jp.sfjp.jindolf.data.Land; +import jp.sfjp.jindolf.data.Period; +import jp.sfjp.jindolf.data.Village; +import jp.sfjp.jindolf.net.HtmlSequence; +import jp.sfjp.jindolf.net.ServerAccess; + +/** + * äººç¼åå½ã®HTTPãµã¼ãããåæã®åå¥ã®æ¥(Period)ãHTMLã§åå¾ããã + * + *

Periodã«ã¯ããã¬ã¤ã¤ã¼åå£«ã®ä¼è©±ã + * ã·ã¹ãã ãèªåçæããã¡ãã»ã¼ã¸ãæ£ããé åºã§ç´ããããã + */ +public final class PeriodLoader { + + private static final Logger LOGGER = Logger.getAnonymousLogger(); + + + /** + * hidden constructor. + */ + private PeriodLoader(){ + assert false; + } + + + /** + * Periodãæ´æ°ãããTopicã®ãªã¹ããæ´æ°ãããã + * + * @param period æ¥ + * @param force trueãªãå¼·å¶åèªã¿è¾¼ã¿ã + * falseãªãã¾ã èªã¿è¾¼ãã§ç¡ãæã®ã¿èªã¿è¾¼ã¿ã + * @throws IOException ãããã¯ã¼ã¯å¥åã¨ã©ã¼ + */ + public static void parsePeriod(Period period, boolean force) + throws IOException{ + if( ! force && period.hasLoaded() ) return; + + Village village = period.getVillage(); + + Land land = village.getParentLand(); + ServerAccess server = land.getServerAccess(); + + HtmlSequence html = server.getHTMLPeriod(period); + DecodedContent content = html.getContent(); + + period.clearTopicList(); + + HtmlParser parser = new HtmlParser(); + PeriodHandler handler = new PeriodHandler(); + parser.setBasicHandler (handler); + parser.setSysEventHandler(handler); + parser.setTalkHandler (handler); + + handler.setPeriod(period); + try{ + parser.parseAutomatic(content); + }catch(HtmlParseException e){ + LOGGER.log(Level.WARNING, "çºè¨æ½åºã«å¤±æ", e); + } + + parser.reset(); + handler.reset(); + + return; + } + +} diff --git a/src/main/java/jp/sfjp/jindolf/data/html/VillageInfoHandler.java b/src/main/java/jp/sfjp/jindolf/data/html/VillageInfoHandler.java new file mode 100644 index 0000000..984b5c3 --- /dev/null +++ b/src/main/java/jp/sfjp/jindolf/data/html/VillageInfoHandler.java @@ -0,0 +1,290 @@ +/* + * village info handler + * + * License : The MIT License + * Copyright(c) 2020 olyutorskii + */ + +package jp.sfjp.jindolf.data.html; + +import java.util.logging.Logger; +import jp.osdn.jindolf.parser.HtmlAdapter; +import jp.osdn.jindolf.parser.HtmlParseException; +import jp.osdn.jindolf.parser.PageType; +import jp.osdn.jindolf.parser.SeqRange; +import jp.osdn.jindolf.parser.content.DecodedContent; +import jp.sfjp.jindolf.data.Land; +import jp.sfjp.jindolf.data.Period; +import jp.sfjp.jindolf.data.Village; +import jp.sourceforge.jindolf.corelib.LandDef; +import jp.sourceforge.jindolf.corelib.LandState; +import jp.sourceforge.jindolf.corelib.PeriodType; +import jp.sourceforge.jindolf.corelib.VillageState; + + +/** + * åæã®HTMLããã¼ã¹ããææå ±ãæ¥ç¨ã®éç¥ãåãåãããã®ãã³ãã©ã + * + *

æ¥ç¨ã¯ç©ºPeriodã®ãªã¹ãã«åæ ããããåPeriodã®ãã¼ãã¯ã¾ã è¡ãããªãã + * + *

â»äººç¼BBS:Gå½ã«ãããG2087æã®ã¨ããã¼ã°ãçµäºããæ®µéã§ã + * äººç¼BBSã¯éå»ãã°ã®æä¾ããè¡ã£ã¦ããªãã + * ã ããã®ã¯ã©ã¹ã«ã¯é²è¡ä¸ã®æããã¼ã¹ããããã®åé·ãªå¦çãè¥å¹²æ®ã£ã¦ããã + */ +class VillageInfoHandler extends HtmlAdapter { + + private static final Logger LOGGER = Logger.getAnonymousLogger(); + + + private Village village = null; + + private boolean hasPrologue; + private boolean hasProgress; + private boolean hasEpilogue; + + private boolean hasDone; + private int maxProgress; + + + /** + * ã³ã³ã¹ãã©ã¯ã¿ã + */ + VillageInfoHandler(){ + super(); + return; + } + + + /** + * æ´æ°å¯¾è±¡ã®æã¤ã³ã¹ã¿ã³ã¹ãè¨å®ããã + * + * @param village æã¤ã³ã¹ã¿ã³ã¹ + */ + void setVillage(Village village){ + this.village = village; + reset(); + return; + } + + /** + * åç¨®é²è¡ã³ã³ããã¹ãã®ãªã»ãããè¡ãã + */ + void reset() { + this.hasPrologue = false; + this.hasProgress = false; + this.hasEpilogue = false; + this.hasDone = false; + this.maxProgress = 0; + return; + } + + /** + * ãã¼ã¹çµæããæã®ç¶æãç®åºããã + * + * @return æã®ç¶æ + */ + private VillageState getVillageState() { + VillageState result = VillageState.UNKNOWN; + + if(this.hasDone){ + result = VillageState.GAMEOVER; + }else if(this.hasEpilogue){ + result = VillageState.EPILOGUE; + }else if(this.hasProgress){ + result = VillageState.PROGRESS; + }else if(this.hasPrologue){ + result = VillageState.PROLOGUE; + } + + return result; + } + + /** + * {@inheritDoc} + * + * @param content {@inheritDoc} + * @throws HtmlParseException {@inheritDoc} + */ + @Override + public void startParse(DecodedContent content) + throws HtmlParseException { + reset(); + return; + } + + /** + * {@inheritDoc} + * + *

HTMLèªåå¤å®ã®çµæãæã®æ¥ç¨ãã¼ã¸ã§ãªããã°ä¾å¤ãæãã + * ãã¼ã¹ãä¸æ¢ããã + * + * @param type {@inheritDoc} + * @throws HtmlParseException {@inheritDoc} æå³ããªããã¼ã¸ãæ¥ãã + */ + @Override + public void pageType(PageType type) throws HtmlParseException { + if(type != PageType.PERIOD_PAGE){ + throw new HtmlParseException("æ¥ãã¼ã¸ãå¿è¦ã§ãã"); + } + return; + } + + /** + * {@inheritDoc} + * + *

æ´æ°æå»ã®éç¥ãåãåãã + * æ´æ°æå»ã¯Villageã¤ã³ã¹ã¿ã³ã¹ã¸åæ ãããã + * + * @param month {@inheritDoc} + * @param day {@inheritDoc} + * @param hour {@inheritDoc} + * @param minute {@inheritDoc} + * @throws HtmlParseException {@inheritDoc} + */ + @Override + public void commitTime(int month, int day, int hour, int minute) + throws HtmlParseException { + this.village.setLimit(month, day, hour, minute); + return; + } + + /** + * {@inheritDoc} + * + *

æ¥ç¨ãã¼ã¸ããåPeriod(æ¥)ã¸ã®ãªã³ã¯HTMLåºç¾ã®éç¥ãåãåãã + * Villageã¤ã³ã¹ã¿ã³ã¹ã®é²è¡ç¶æ³ã¸åæ ãããã + * + * @param content {@inheritDoc} + * @param anchorRange {@inheritDoc} + * @param periodType {@inheritDoc} + * @param day {@inheritDoc} + * @throws HtmlParseException {@inheritDoc} + */ + @Override + public void periodLink(DecodedContent content, + SeqRange anchorRange, + PeriodType periodType, + int day) + throws HtmlParseException { + if(periodType == null){ + this.hasDone = true; + return; + } + + switch(periodType){ + case PROLOGUE: + this.hasPrologue = true; + break; + case PROGRESS: + this.hasProgress = true; + this.maxProgress = day; + break; + case EPILOGUE: + this.hasEpilogue = true; + break; + default: + assert false; + break; + } + + return; + } + + /** + * {@inheritDoc} + * + *

ãã¼ã¹çµäºæã®å¦çãè¡ãã + * + *

æã®é²è¡ã«å¾ãç©ºPeriodã®ãªã¹ããçæããã + * + * @throws HtmlParseException {@inheritDoc} + */ + @Override + public void endParse() throws HtmlParseException { + VillageState villageState = getVillageState(); + if(villageState == VillageState.UNKNOWN){ + this.village.setState(villageState); + LOGGER.warning("æã®ç¶æ³ãèªã¿åãã¾ãã"); + return; + } + + Land land = this.village.getParentLand(); + LandDef landDef = land.getLandDef(); + LandState landState = landDef.getLandState(); + + if(landState != LandState.ACTIVE){ + villageState = VillageState.GAMEOVER; + } + this.village.setState(villageState); + + modifyPeriodList(); + + return; + } + + /** + * æ½åºããPeriodå¥ãªã³ã¯æå ±ã«ä¼´ãç©ºPeriodãªã¹ããæºåããã + * + *

ã¾ã Periodãã¼ã¿ã®ãã¼ãã¯è¡ãããªãã + * + *

ã²ã¼ã é²è¡ä¸ã®æã§æ´æ°æå»ãã¾ããã§æ´æ°ãè¡ãããå ´åã + * æ¢åã®Periodãªã¹ããä¼¸å¼µããå ´åãããã + */ + private void modifyPeriodList() { + Period lastPeriod = null; + if(this.hasPrologue){ + Period prologue = this.village.getPrologue(); + if(prologue == null){ + lastPeriod = + new Period(this.village, + PeriodType.PROLOGUE, + 0 ); + this.village.setPeriod(0, lastPeriod); + }else{ + lastPeriod = prologue; + } + } + + if(this.hasProgress){ + for(int day = 1; day <= this.maxProgress; day++){ + Period progress = this.village.getProgress(day); + if(progress == null){ + lastPeriod = + new Period(this.village, + PeriodType.PROGRESS, + day ); + this.village.setPeriod(day, lastPeriod); + }else{ + lastPeriod = progress; + } + } + } + + if(this.hasEpilogue){ + Period epilogue = this.village.getEpilogue(); + if(epilogue == null){ + int epilogueDay = this.maxProgress + 1; + lastPeriod = + new Period(this.village, + PeriodType.EPILOGUE, + epilogueDay ); + this.village.setPeriod(epilogueDay, lastPeriod); + } else { + lastPeriod = epilogue; + } + } + + assert this.village.getPeriodSize() > 0; + assert lastPeriod != null; + + return; + } + +} diff --git a/src/main/java/jp/sfjp/jindolf/data/html/VillageInfoLoader.java b/src/main/java/jp/sfjp/jindolf/data/html/VillageInfoLoader.java new file mode 100644 index 0000000..e0a465d --- /dev/null +++ b/src/main/java/jp/sfjp/jindolf/data/html/VillageInfoLoader.java @@ -0,0 +1,110 @@ +/* + * village information loader + * + * License : The MIT License + * Copyright(c) 2008 olyutorskii + */ + +package jp.sfjp.jindolf.data.html; + +import java.io.IOException; +import java.util.logging.Level; +import java.util.logging.Logger; +import jp.osdn.jindolf.parser.HtmlParseException; +import jp.osdn.jindolf.parser.HtmlParser; +import jp.osdn.jindolf.parser.content.DecodedContent; +import jp.sfjp.jindolf.data.Land; +import jp.sfjp.jindolf.data.Village; +import jp.sfjp.jindolf.net.HtmlSequence; +import jp.sfjp.jindolf.net.ServerAccess; +import jp.sourceforge.jindolf.corelib.LandDef; +import jp.sourceforge.jindolf.corelib.LandState; + +/** + * äººç¼åå½ã®HTTPãµã¼ãããåå¥ã®æã®ææå ±ãHTMLã§åå¾ããã + * + *

åPeriodã®ä¼è©±ã¯ã¾ã ãã¼ããããªãã + */ +public final class VillageInfoLoader { + + private static final Logger LOGGER = Logger.getAnonymousLogger(); + + + /** + * Hidden constructor. + */ + private VillageInfoLoader() { + assert false; + } + + + /** + * äººç¼BBSãµã¼ããã + * HTMLã§è¨è¿°ãããåæã®ææå ±ãã¼ã¸ããã¦ã³ãã¼ãããã + * + *

â» Gå½HISTORICALéç¨ç§»è¡ã«ä¼´ãã + * 2020-02ã®æç¹ã§é²è¡ä¸ã®æã¯ãã¯ãåå¨ããªãããã + * è¥å¹²ã®åé·ãªã³ã¼ããæ®åããã + * + *

ä¾: G1000æ(ã¨ããã¼ã°çµäºç¶æ)ã®ææå ±ãã¼ã¸ã¯ + * + * http://www.wolfg.x0.com/index.rb?vid=1000 + * + * @param village æ + * @return HTMLææ¸ + * @throws IOException å¥åºåã¨ã©ã¼ + */ + private static DecodedContent loadVillageInfo(Village village) + throws IOException{ + Land land = village.getParentLand(); + ServerAccess server = land.getServerAccess(); + LandDef landDef = land.getLandDef(); + LandState landState = landDef.getLandState(); + + HtmlSequence html; + if(landState == LandState.ACTIVE){ + html = server.getHTMLBoneHead(village); + }else{ + html = server.getHTMLVillage(village); + } + + DecodedContent content = html.getContent(); + + return content; + } + + /** + * äººç¼BBSãµã¼ãããåæã®Periodä¸è¦§æå ±ãå«ã¾ããHTML(ææå ±)ãåå¾ãã + * æ´æ°æå»ãæ¥ç¨ãç©ºPeriodã®ãªã¹ããVillageã¤ã³ã¹ã¿ã³ã¹ã«è¨å®ããã + * + * @param village æ + * @throws java.io.IOException ãããã¯ã¼ã¯å¥åºåã®ç°å¸¸ + */ + public static void updateVillageInfo(Village village) + throws IOException{ + DecodedContent content = loadVillageInfo(village); + + HtmlParser parser = new HtmlParser(); + VillageInfoHandler handler = new VillageInfoHandler(); + parser.setBasicHandler (handler); + parser.setSysEventHandler(handler); + parser.setTalkHandler (handler); + + handler.setVillage(village); + try{ + parser.parseAutomatic(content); + }catch(HtmlParseException e){ + LOGGER.log(Level.WARNING, "æã®ç¶æãä¸æ", e); + } + + parser.reset(); + handler.reset(); + + return; + } + +} diff --git a/src/main/java/jp/sfjp/jindolf/data/html/VillageListHandler.java b/src/main/java/jp/sfjp/jindolf/data/html/VillageListHandler.java new file mode 100644 index 0000000..446907e --- /dev/null +++ b/src/main/java/jp/sfjp/jindolf/data/html/VillageListHandler.java @@ -0,0 +1,165 @@ +/* + * village list handler + * + * License : The MIT License + * Copyright(c) 2008 olyutorskii + */ + +package jp.sfjp.jindolf.data.html; + +import java.util.LinkedList; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import jp.osdn.jindolf.parser.HtmlAdapter; +import jp.osdn.jindolf.parser.HtmlParseException; +import jp.osdn.jindolf.parser.PageType; +import jp.osdn.jindolf.parser.SeqRange; +import jp.osdn.jindolf.parser.content.DecodedContent; +import jp.sourceforge.jindolf.corelib.VillageState; + +/** + * åå½ã®æä¸è¦§HTMLããã¼ã¹ããæä¸è¦§éç¥ãåãåãããã®ãã³ãã©ã + * + *

ãã¼ã¹çµäºæã«ã¯æä¸è¦§ãªã¹ããå®æããã + */ +class VillageListHandler extends HtmlAdapter{ + + private static final Logger LOGGER = Logger.getAnonymousLogger(); + + private static final String ERR_ILLEGALPAGE = + "ããããã¼ã¸ãæä¸è¦§ãã¼ã¸ãå¿è¦ã§ãã"; + private static final String ERR_URI = + "èªèã§ããªãURL[{0}]ã«ééãã¾ããã"; + + private static final Pattern REG_VID = Pattern.compile( + "\\Qindex.rb?vid=\\E" + "([1-9][0-9]*)" + "\\Q&\\E"); + + + private List villageRecords = new LinkedList<>(); + + + /** + * ã³ã³ã¹ãã©ã¯ã¿ã + */ + VillageListHandler() { + super(); + this.villageRecords = new LinkedList<>(); + return; + } + + + /** + * HTMLã®Aã¿ã°åHREFå±æ§å¤ããæIDãå¾ãã + * + *

Gå½ãå«ãæIDã¯0ä»¥å¤ããå§ã¾ã1ä»¥ä¸ã®10é²æ°ã + * + * @param hrefValue HREFå±æ§å¤ + * @return æIDãè¦ã¤ãããªããã°nullã + */ + static String parseVidFromHref(CharSequence hrefValue){ + Matcher matcher = REG_VID.matcher(hrefValue); + boolean match = matcher.lookingAt(); + if(!match) return null; + + String result = matcher.group(1); + assert result.length() > 0; + + return result; + } + + + /** + * ãã¼ã¹çµæã®æä¸è¦§ãè¿ãã + * + * @return æä¸è¦§ + */ + List getVillageRecords(){ + return this.villageRecords; + } + + /** + * ãªã»ãããè¡ãã + * + *

æä¸è¦§ãªã¹ãã¯ç©ºã«ãªãã + */ + void reset() { + this.villageRecords = new LinkedList<>(); + return; + } + + /** + * {@inheritDoc} + * + *

ãã¼ã¹éå§éç¥ãåããæä¸è¦§ãªã¹ããåæåããã + * + * @param content {@inheritDoc} + * @throws HtmlParseException {@inheritDoc} + */ + @Override + public void startParse(DecodedContent content) throws HtmlParseException { + reset(); + return; + } + + /** + * {@inheritDoc} + * + *

ãã¼ã¸èªåå¤å®ã®çµæã®éç¥ãåãã + * ãã¼ã¹å¯¾è±¡HTMLãããããã¼ã¸ã§ãæä¸è¦§ãã¼ã¸ã§ããªããã° + * ä¾å¤ãæããã¼ã¹ãä¸æ¢ãããã + * + * @param type {@inheritDoc} + * @throws HtmlParseException {@inheritDoc} æå³ããªããã¼ã¸ãæ¥ãã + */ + @Override + public void pageType(PageType type) throws HtmlParseException { + if( type != PageType.VILLAGELIST_PAGE + && type != PageType.TOP_PAGE ){ + throw new HtmlParseException(ERR_ILLEGALPAGE); + } + return; + } + + /** + * {@inheritDoc} + * + *

æURLåºç¾ã®éç¥ãåããæä¸è¦§ãªã¹ãã«æãè¿½å ããã + * + * @param content {@inheritDoc} + * @param anchorRange {@inheritDoc} + * @param villageRange {@inheritDoc} + * @param hour {@inheritDoc} + * @param minute {@inheritDoc} + * @param villageState {@inheritDoc} + * @throws HtmlParseException {@inheritDoc} + */ + @Override + public void villageRecord(DecodedContent content, + SeqRange anchorRange, + SeqRange villageRange, + int hour, int minute, + VillageState villageState) + throws HtmlParseException { + CharSequence href = anchorRange.sliceSequence(content); + String villageID = parseVidFromHref(href); + if(villageID == null){ + LOGGER.log(Level.WARNING, ERR_URI, href); + return; + } + + CharSequence fullVillageName = villageRange.sliceSequence(content); + + VillageRecord record = + new VillageRecord(villageID, + fullVillageName.toString(), + villageState ); + + this.villageRecords.add(record); + + return; + } + +} diff --git a/src/main/java/jp/sfjp/jindolf/data/html/VillageListLoader.java b/src/main/java/jp/sfjp/jindolf/data/html/VillageListLoader.java new file mode 100644 index 0000000..d20b802 --- /dev/null +++ b/src/main/java/jp/sfjp/jindolf/data/html/VillageListLoader.java @@ -0,0 +1,177 @@ +/* + * village list loader + * + * License : The MIT License + * Copyright(c) 2008 olyutorskii + */ + +package jp.sfjp.jindolf.data.html; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.SortedSet; +import java.util.TreeSet; +import java.util.logging.Level; +import java.util.logging.Logger; +import jp.osdn.jindolf.parser.HtmlParseException; +import jp.osdn.jindolf.parser.HtmlParser; +import jp.osdn.jindolf.parser.content.DecodedContent; +import jp.sfjp.jindolf.data.Land; +import jp.sfjp.jindolf.data.Village; +import jp.sfjp.jindolf.net.HtmlSequence; +import jp.sfjp.jindolf.net.ServerAccess; +import jp.sourceforge.jindolf.corelib.LandDef; +import jp.sourceforge.jindolf.corelib.LandState; +import jp.sourceforge.jindolf.corelib.VillageState; + +/** + * äººç¼åå½ã®HTTPãµã¼ãããæä¸è¦§ãªã¹ããåå¾ããã + */ +public final class VillageListLoader { + + private static final Logger LOGGER = Logger.getAnonymousLogger(); + + // å¤å½ID + private static final String ID_VANILLAWOLF = "wolf"; + + private static final List EMPTY_LIST = + Collections.emptyList(); + + + /** + * Hidden constructor. + */ + private VillageListLoader() { + assert false; + } + + + /** + * æä¸è¦§ãªã¹ãããµã¼ããããã¦ã³ãã¼ãããã + * + *

ãªã¹ãåæå ±ã¯å½ã®ããããã¼ã¸ã¨æä¸è¦§ãã¼ã¸ã + * + *

æ»ãããæä¸è¦§ä¸å¤ãªã¹ãã¯ã½ã¼ãæ¸ã¿ã§éè¤ããªãã + * + * @param land å½ + * @return æä¸è¦§ã®ä¸å¤ãªã¹ã + * @throws java.io.IOException ãããã¯ã¼ã¯å¥åºåã®ç°å¸¸ + */ + public static List loadVillageList(Land land) + throws IOException{ + SortedSet records = loadVillageRecords(land); + + LandDef landDef = land.getLandDef(); + LandState landState = landDef.getLandState(); + boolean isHistorical = landState == LandState.HISTORICAL; + + List result = new ArrayList<>(records.size()); + + for(VillageRecord record : records){ + String id = record.getVillageId(); + String fullVillageName = record.getFullVillageName(); + + VillageState status; + if(isHistorical){ + status = VillageState.GAMEOVER; + }else{ + status = record.getVillageStatus(); + } + + Village village = new Village(land, id, fullVillageName); + village.setState(status); + + result.add(village); + } + + result = Collections.unmodifiableList(result); + + return result; + } + + /** + * æä¸è¦§ãªã¹ããåå½ãµã¼ããããã¦ã³ãã¼ãããã + * + *

ãªã¹ãåæå ±ã¯å½ã®ããããã¼ã¸ã¨æä¸è¦§ãã¼ã¸ã + * + *

æ»ãããæä¸è¦§ã»ããã¯é åºã¥ãããã¦ããéè¤ã¯ãªãã + * + * @param land å½ + * @return æä¸è¦§ã»ãã + * @throws java.io.IOException ãããã¯ã¼ã¯å¥åºåã®ç°å¸¸ + */ + private static SortedSet loadVillageRecords(Land land) + throws IOException{ + LandDef landDef = land.getLandDef(); + boolean isVanillaWolf = landDef.getLandId().equals(ID_VANILLAWOLF); + LandState state = landDef.getLandState(); + + boolean needTopPage = + state.equals(LandState.ACTIVE) || isVanillaWolf; + boolean hasVillageList = ! isVanillaWolf; + + ServerAccess server = land.getServerAccess(); + + // æé ã½ã¼ãã¨éè¤æé¤å¦çã éè¤ä¾) Bå½116æ + SortedSet result = new TreeSet<>(); + + // ããããã¼ã¸ + if(needTopPage){ + List recList = EMPTY_LIST; + HtmlSequence html = server.getHTMLTopPage(); + try{ + recList = parseVillageRecords(html); + }catch(HtmlParseException e){ + LOGGER.log(Level.WARNING, "ããããã¼ã¸ãèªèã§ããªã", e); + } + result.addAll(recList); + } + + // æä¸è¦§ãã¼ã¸ + if(hasVillageList){ + List recList = EMPTY_LIST; + HtmlSequence html = server.getHTMLLandList(); + try{ + recList = parseVillageRecords(html); + }catch(HtmlParseException e){ + LOGGER.log(Level.WARNING, "æä¸è¦§ãã¼ã¸ãèªèã§ããªã", e); + } + result.addAll(recList); + } + + return result; + } + + /** + * HTMLããã¼ã¹ãæä¸è¦§ãªã¹ããè¿ãã + * + * @param html HTMLææ¸ + * @return æä¸è¦§ãªã¹ã + * @throws HtmlParseException HTMLãã¼ã¹ã¨ã©ã¼ã«ãããã¼ã¹åæ¢ + */ + private static List parseVillageRecords(HtmlSequence html) + throws HtmlParseException{ + HtmlParser parser = new HtmlParser(); + VillageListHandler handler = new VillageListHandler(); + parser.setBasicHandler(handler); + + DecodedContent content = html.getContent(); + parser.parseAutomatic(content); + + List result = handler.getVillageRecords(); + + parser.reset(); + handler.reset(); + + return result; + } + +} diff --git a/src/main/java/jp/sfjp/jindolf/data/html/VillageRecord.java b/src/main/java/jp/sfjp/jindolf/data/html/VillageRecord.java new file mode 100644 index 0000000..efea2b5 --- /dev/null +++ b/src/main/java/jp/sfjp/jindolf/data/html/VillageRecord.java @@ -0,0 +1,113 @@ +/* + * village record + * + * License : The MIT License + * Copyright(c) 2020 olyutorskii + */ + +package jp.sfjp.jindolf.data.html; + +import jp.sourceforge.jindolf.corelib.VillageState; + +/** + * Village record on HTML. + */ +class VillageRecord implements Comparable { + + private final String villageId; + private final String fullVillageName; + private final VillageState villageStatus; + + private final int villageIdNum; + + + /** + * Constructor. + * + * @param villageId village id on CGI query + * @param fullVillageName full village name + * @param villageStatus village status + */ + VillageRecord(String villageId, + String fullVillageName, + VillageState villageStatus ){ + super(); + + this.villageId = villageId; + this.fullVillageName = fullVillageName; + this.villageStatus = villageStatus; + + this.villageIdNum = Integer.parseInt(villageId); + + return; + } + + /** + * return village id on CGI query. + * + * @return village id + */ + String getVillageId(){ + return this.villageId; + } + + /** + * return long village name. + * + * @return long village name + */ + String getFullVillageName(){ + return this.fullVillageName; + } + + /** + * return village status. + * + * @return village status + */ + VillageState getVillageStatus(){ + return this.villageStatus; + } + + /** + * {@inheritDoc} + * + *

æIDã®èªç¶æ°é ã«é åºã¥ããã + * + * @param rec {@inheritDoc} + * @return {@inheritDoc} + */ + @Override + public int compareTo(VillageRecord rec) { + int result = this.villageIdNum - rec.villageIdNum; + return result; + } + + /** + * {@inheritDoc} + * + * @return {@inheritDoc} + */ + @Override + public int hashCode() { + return this.villageId.hashCode(); + } + + /** + * {@inheritDoc} + * + * @param obj {@inheritDoc} + * @return {@inheritDoc} + */ + @Override + public boolean equals(Object obj) { + if(this == obj) return true; + if(obj == null) return false; + + if(! (obj instanceof VillageRecord)) return false; + VillageRecord other = (VillageRecord) obj; + + return this.villageId.equals(other.villageId); + } + +} diff --git a/src/main/java/jp/sfjp/jindolf/data/html/package-info.java b/src/main/java/jp/sfjp/jindolf/data/html/package-info.java new file mode 100644 index 0000000..c67ada7 --- /dev/null +++ b/src/main/java/jp/sfjp/jindolf/data/html/package-info.java @@ -0,0 +1,15 @@ +/* + * package info + * + * License : The MIT License + * Copyright(c) 2020 olyutorskii + */ + +/** + * äººç¼BBSãµã¼ãããåä¿¡ããHTMLãã¼ã¿ããã + * JinParserãªã©ãç¨ãã¦åç¨®ãã¼ã¿ã¢ãã«ãçæããã¯ã©ã¹ç¾¤ã + */ + +package jp.sfjp.jindolf.data.html; + +/* EOF */ diff --git a/src/main/java/jp/sfjp/jindolf/data/xml/BotherHandler.java b/src/main/java/jp/sfjp/jindolf/data/xml/BotherHandler.java new file mode 100644 index 0000000..e6e383c --- /dev/null +++ b/src/main/java/jp/sfjp/jindolf/data/xml/BotherHandler.java @@ -0,0 +1,69 @@ +/* + * XML custom error-handler + * + * License : The MIT License + * Copyright(c) 2010 MikuToga Partners + */ + +package jp.sfjp.jindolf.data.xml; + +import org.xml.sax.ErrorHandler; +import org.xml.sax.SAXException; +import org.xml.sax.SAXParseException; + +/** + * èªè£½ã¨ã©ã¼ãã³ãã©ã + * + *

ä¾å¤ãæ¸¡ãããã°å³æãè¿ãã + */ +public final class BotherHandler implements ErrorHandler{ + + /** + * å¯ä¸ã®ã·ã³ã°ã«ãã³ã + */ + public static final ErrorHandler HANDLER = new BotherHandler(); + + + /** + * é ãã³ã³ã¹ãã©ã¯ã¿ã + */ + private BotherHandler(){ + super(); + return; + } + + + /** + * {@inheritDoc} + * + * @param exception {@inheritDoc} + * @throws SAXException {@inheritDoc} + */ + @Override + public void error(SAXParseException exception) throws SAXException{ + throw exception; + } + + /** + * {@inheritDoc} + * + * @param exception {@inheritDoc} + * @throws SAXException {@inheritDoc} + */ + @Override + public void fatalError(SAXParseException exception) throws SAXException{ + throw exception; + } + + /** + * {@inheritDoc} + * + * @param exception {@inheritDoc} + * @throws SAXException {@inheritDoc} + */ + @Override + public void warning(SAXParseException exception) throws SAXException{ + throw exception; + } + +} diff --git a/src/main/java/jp/sfjp/jindolf/data/xml/ElemTag.java b/src/main/java/jp/sfjp/jindolf/data/xml/ElemTag.java new file mode 100644 index 0000000..9c6da11 --- /dev/null +++ b/src/main/java/jp/sfjp/jindolf/data/xml/ElemTag.java @@ -0,0 +1,138 @@ +/* + * village XML file element tags + * + * License : The MIT License + * Copyright(c) 2020 olyutorskii + */ + +package jp.sfjp.jindolf.data.xml; + +import java.util.HashMap; +import java.util.Map; +import jp.sourceforge.jindolf.corelib.SysEventType; + +/** + * XMLãã¡ã¤ã«ã®ã¿ã°è¦ç´ åãã³ã¼ãã + */ +public enum ElemTag { + + VILLAGE("village"), + AVATARLIST("avatarList"), + AVATAR("avatar"), + AVATARREF("avatarRef"), + PERIOD("period"), + + TALK("talk"), + LI("li"), + RAWDATA("rawdata"), + + STARTENTRY("startEntry", SysEventType.STARTENTRY), + ONSTAGE("onStage", SysEventType.ONSTAGE), + STARTMIRROR("startMirror", SysEventType.STARTMIRROR), + OPENROLE("openRole", SysEventType.OPENROLE), + MURDERED("murdered", SysEventType.MURDERED), + STARTASSAULT("startAssault", SysEventType.STARTASSAULT), + SURVIVOR("survivor", SysEventType.SURVIVOR), + COUNTING("counting", SysEventType.COUNTING), + SUDDENDEATH("suddenDeath", SysEventType.SUDDENDEATH), + NOMURDER("noMurder", SysEventType.NOMURDER), + WINVILLAGE("winVillage", SysEventType.WINVILLAGE), + WINWOLF("winWolf", SysEventType.WINWOLF), + WINHAMSTER("winHamster", SysEventType.WINHAMSTER), + PLAYERLIST("playerList", SysEventType.PLAYERLIST), + PANIC("panic", SysEventType.PANIC), + EXECUTION("execution", SysEventType.EXECUTION), + VANISH("vanish", SysEventType.VANISH), + CHECKOUT("checkout", SysEventType.CHECKOUT), + SHORTMEMBER("shortMember", SysEventType.SHORTMEMBER), + ASKENTRY("askEntry", SysEventType.ASKENTRY), + ASKCOMMIT("askCommit", SysEventType.ASKCOMMIT), + NOCOMMENT("noComment", SysEventType.NOCOMMENT), + STAYEPILOGUE("stayEpilogue", SysEventType.STAYEPILOGUE), + GAMEOVER("gameOver", SysEventType.GAMEOVER), + JUDGE("judge", SysEventType.JUDGE), + GUARD("guard", SysEventType.GUARD), + COUNTING2("counting2", SysEventType.COUNTING2), + ASSAULT("assault", SysEventType.ASSAULT), + + ROLEHEADS("roleHeads"), + VOTE("vote"), + PLAYERINFO("playerInfo"), + NOMINATED("nominated"), + ; + + + private final String name; + private final SysEventType sysEventType; + + + /** + * constructor. + * + * @param name element name + * @param isSysEvent true if SysEvent + */ + ElemTag(String name, SysEventType type){ + this.name = name; + this.sysEventType = type; + return; + } + + /** + * constructor. + * + *

It's not SysEvent. + * + * @param name element name + */ + ElemTag(String name){ + this(name, null); + return; + } + + + /** + * get ElemTag map with name-space Prefixed key. + * + * @param pfx prefix + * @return ElemTag + */ + public static Map getQNameMap(String pfx){ + Map result = new HashMap<>(); + + String lead; + if(pfx.isEmpty()){ + lead = ""; + }else{ + lead = pfx + ":"; + } + + for(ElemTag tag : values()){ + String key = lead + tag.name; + key = key.intern(); + result.put(key, tag); + } + + return result; + } + + + /** + * ã¿ã°ãSysEventãå¤å®ããã + * + * @return SysEventãªãtrue + */ + public boolean isSysEventTag(){ + return this.sysEventType != null; + } + + /** + * return SysEventType. + * + * @return SysEventType. true if not SystemEvent. + */ + public SysEventType getSystemEventType(){ + return this.sysEventType; + } + +} diff --git a/src/main/java/jp/sfjp/jindolf/data/xml/NoopEntityResolver.java b/src/main/java/jp/sfjp/jindolf/data/xml/NoopEntityResolver.java new file mode 100644 index 0000000..638df4e --- /dev/null +++ b/src/main/java/jp/sfjp/jindolf/data/xml/NoopEntityResolver.java @@ -0,0 +1,58 @@ +/* + * No-operation Entity Resolver for XML. + * + * License : The MIT License + * Copyright(c) 2019 olyutorskii + */ + +package jp.sfjp.jindolf.data.xml; + +import java.io.Reader; +import java.io.StringReader; +import org.xml.sax.EntityResolver; +import org.xml.sax.InputSource; + +/** + * No-operation Entity Resolver implementation for preventing XXE. + * + * @see + * XML external entity attack (Wikipedia) + * + */ +public final class NoopEntityResolver implements EntityResolver{ + + /** Singleton resolver. */ + public static final EntityResolver NOOP_RESOLVER = + new NoopEntityResolver(); + + + /** + * Constructor. + */ + private NoopEntityResolver(){ + super(); + return; + } + + + /** + * {@inheritDoc} + * + *

Prevent any external entity reference XXE. + * + * @param publicId {@inheritDoc} + * @param systemId {@inheritDoc} + * @return empty input source + */ + @Override + public InputSource resolveEntity(String publicId, String systemId){ + Reader emptyReader = new StringReader(""); + InputSource source = new InputSource(emptyReader); + + source.setPublicId(publicId); + source.setSystemId(systemId); + + return source; + } + +} diff --git a/src/main/java/jp/sfjp/jindolf/data/xml/VillageHandler.java b/src/main/java/jp/sfjp/jindolf/data/xml/VillageHandler.java new file mode 100644 index 0000000..7e8c144 --- /dev/null +++ b/src/main/java/jp/sfjp/jindolf/data/xml/VillageHandler.java @@ -0,0 +1,952 @@ +/* + * village handler + * + * License : The MIT License + * Copyright(c) 2020 olyutorskii + */ + +package jp.sfjp.jindolf.data.xml; + +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import jp.osdn.jindolf.parser.content.DecodedContent; +import jp.sfjp.jindolf.data.Avatar; +import jp.sfjp.jindolf.data.CoreData; +import jp.sfjp.jindolf.data.InterPlay; +import jp.sfjp.jindolf.data.Land; +import jp.sfjp.jindolf.data.Nominated; +import jp.sfjp.jindolf.data.Period; +import jp.sfjp.jindolf.data.Player; +import jp.sfjp.jindolf.data.SysEvent; +import jp.sfjp.jindolf.data.Talk; +import jp.sfjp.jindolf.data.Topic; +import jp.sfjp.jindolf.data.Village; +import jp.sourceforge.jindolf.corelib.Destiny; +import jp.sourceforge.jindolf.corelib.EventFamily; +import jp.sourceforge.jindolf.corelib.GameRole; +import jp.sourceforge.jindolf.corelib.PeriodType; +import jp.sourceforge.jindolf.corelib.SysEventType; +import jp.sourceforge.jindolf.corelib.TalkType; +import jp.sourceforge.jindolf.corelib.VillageState; +import org.xml.sax.Attributes; +import org.xml.sax.ContentHandler; +import org.xml.sax.Locator; +import org.xml.sax.SAXException; + +/** + * Villageã®XMLãã¼ãµæ¬ä½ã + * + *

ãã¼ã¹ä¸ã®åç¨®ã³ã³ããã¹ããä¿æããã + */ +public class VillageHandler implements ContentHandler{ + + private static final String NS_JINARCHIVE = + "http://jindolf.sourceforge.jp/xml/ns/501"; + + private static final int TALKTYPE_NUM = TalkType.values().length; + + + private String nsPfx; + + private Land land; + private Village village; + private Period period; + + private Talk talk; + private int talkNo; + + private SysEvent sysEvent; + + private boolean inLine; + private final StringBuilder content = new StringBuilder(250); + + /** éå¥ãAvatarå¥ãä¼è©±ç¨®å¥ã®ä¼è©±éãçªå·ã */ + private final Map countMap = + new HashMap<>(); + + private final Map idAvatarMap = new HashMap<>(); + private final List avatarList = new LinkedList<>(); + private final List playerList = new LinkedList<>(); + private final List nominatedList = new LinkedList<>(); + private final List interPlayList = new LinkedList<>(); + + private Map qNameMap = ElemTag.getQNameMap(""); + + + /** + * constructor. + */ + public VillageHandler(){ + super(); + return; + } + + + /** + * å±æ§å¤ãå¾ãã + * + * @param atts å±æ§éå + * @param attrName å±æ§å + * @return å±æ§å¤ããªããã°nullã + */ + private static String attrValue(Attributes atts, String attrName){ + String result = atts.getValue("", attrName); + return result; + } + + + /** + * decode ElemTag. + * + * @param uri URI of namespace + * @param localName local name + * @param qName Qname + * @return + */ + private ElemTag decodeElemTag(String uri, + String localName, + String qName){ + ElemTag result = this.qNameMap.get(qName); + return result; + } + + /** + * ãã¼ã¹ããçµæã®Villageãè¿ãã + * + * @return æã + */ + public Village getVillage(){ + return this.village; + } + + /** + * ãã¼ã¹éå§åã®æºåã + */ + private void resetBefore(){ + this.idAvatarMap.clear(); + this.countMap.clear(); + this.content.setLength(0); + this.avatarList.clear(); + this.playerList.clear(); + this.nominatedList.clear(); + this.interPlayList.clear(); + this.inLine = false; + return; + } + + /** + * ãã¼ã¹éå§å¾ã®å¾å§æ«ã + */ + private void resetAfter(){ + this.idAvatarMap.clear(); + this.countMap.clear(); + this.content.setLength(0); + this.avatarList.clear(); + this.playerList.clear(); + this.nominatedList.clear(); + this.interPlayList.clear(); + this.nsPfx = null; + this.land = null; + this.period = null; + return; + } + + /** + * villageè¦ç´ éå§ã®åä¿¡ã + * + * @param atts å±æ§ + */ + private void startVillage(Attributes atts){ + String landId = attrValue(atts, "landId"); + String vid = attrValue(atts, "vid"); + String name = attrValue(atts, "fullName"); + String state = attrValue(atts, "state"); + + this.land = CoreData.getLandDefList().stream() + .filter(landDef -> landDef.getLandId().equals(landId)) + .map(landDef -> new Land(landDef)) + .findFirst().get(); + + this.village = new Village(this.land, vid, name); + + this.village.setState(VillageState.GAMEOVER); + + this.talkNo = 0; + this.period = null; + + return; + } + + /** + * avatarè¦ç´ éå§ã®åä¿¡ã + * + * @param atts å±æ§ + */ + private void startAvatar(Attributes atts){ + String avatarId = attrValue(atts, "avatarId"); + String fullName = attrValue(atts, "fullName"); + String shortName = attrValue(atts, "shortName"); + String faceIconUri = attrValue(atts, "faceIconURI"); + + Avatar avatar = Avatar.getAvatarByFullname(fullName); + + this.village.addAvatar(avatar); + this.idAvatarMap.put(avatarId, avatar); + + return; + } + + /** + * periodè¦ç´ éå§ã®åä¿¡ã + * + * @param atts å±æ§ + */ + private void startPeriod(Attributes atts) throws SAXException{ + String typeAttr = attrValue(atts, "type"); + String dayAttr = attrValue(atts, "day"); + + PeriodType periodType = XmlDecoder.decodePeriodType(typeAttr); + int day = Integer.parseInt(dayAttr); + + this.period = new Period(this.village, periodType, day); + + // append tail + int periodIdx = this.village.getPeriodSize(); + this.village.setPeriod(periodIdx, this.period); + + return; + } + + /** + * periodè¦ç´ çµäºã®åä¿¡ã + */ + private void endPeriod(){ + this.countMap.clear(); + return; + } + + /** + * æ¥å¥ãAvatarå¥ãä¼è©±ç¨®ãã¨ã«çºè¨åæ°ãã¤ã³ã¯ãªã¡ã³ãããã + * + * @param targetAvatar å¯¾è±¡Avatar + * @param targetType å¯¾è±¡ä¼è©±ç¨® + * @return ç¾æç¹ã§ã®ã«ã¦ã³ãæ° + */ + private int countUp(Avatar targetAvatar, TalkType targetType){ + int[] avatarCount = this.countMap.get(targetAvatar); + if(avatarCount == null){ + avatarCount = new int[TALKTYPE_NUM]; + this.countMap.put(targetAvatar, avatarCount); + } + + int typeIdx = targetType.ordinal(); + int count = ++avatarCount[typeIdx]; + + return count; + } + + /** + * talkè¦ç´ éå§ã®åä¿¡ã + * + * @param atts å±æ§ + */ + private void startTalk(Attributes atts) throws SAXException{ + String type = attrValue(atts, "type"); + String avatarId = attrValue(atts, "avatarId"); + String xname = attrValue(atts, "xname"); + String time = attrValue(atts, "time"); + + TalkType talkType = XmlDecoder.decodeTalkType(type); + Avatar talkAvatar = this.idAvatarMap.get(avatarId); + int hour = XmlDecoder.decodeHour (time); + int minute = XmlDecoder.decodeMinute(time); + + this.talk = new Talk( + this.period, + talkType, talkAvatar, + 0, xname, + hour, minute, + "" + ); + + int count = countUp(talkAvatar, talkType); + this.talk.setCount(count); + + this.content.setLength(0); + + return; + } + + /** + * talkè¦ç´ çµäºã®åä¿¡ã + */ + private void endTalk(){ + int no = 0; + if(this.talk.getTalkType() == TalkType.PUBLIC){ + no = ++this.talkNo; + } + + String dialog = this.content.toString(); + this.content.setLength(0); + + this.talk.setTalkNo(no); + this.talk.setDialog(dialog); + + this.period.addTopic(this.talk); + + return; + } + + /** + * liè¦ç´ éå§ã®åä¿¡ã + * + * @param atts å±æ§ + */ + private void startLi(Attributes atts){ + this.inLine = true; + if(this.content.length() > 0){ + this.content.append('\n'); + } + return; + } + + /** + * liè¦ç´ çµäºã®åä¿¡ã + */ + private void endLi(){ + this.inLine = false; + return; + } + + /** + * playerListè¦ç´ éå§ãåä¿¡ããã + * + * @param atts å±æ§ + */ + private void startPlayerList(Attributes atts){ + this.playerList.clear(); + return; + } + + /** + * playerListè¦ç´ çµäºãåä¿¡ããã + */ + private void endPlayerList(){ + this.sysEvent.addPlayerList(this.playerList); + this.playerList.clear(); + return; + } + + /** + * executionè¦ç´ éå§ãåä¿¡ããã + * + * @param atts å±æ§ + */ + private void startExecution(Attributes atts){ + String victimId = attrValue(atts, "victim"); + + if(victimId != null){ + Avatar victim = this.idAvatarMap.get(victimId); + List single = Collections.singletonList(victim); + this.sysEvent.addAvatarList(single); + } + + return; + } + + /** + * executionè¦ç´ çµäºãåä¿¡ããã + */ + private void endExecution(){ + this.sysEvent.addNominatedList(this.nominatedList); + this.nominatedList.clear(); + return; + } + + /** + * countingè¦ç´ çµäºãåä¿¡ããã + */ + private void endCounting(){ + this.sysEvent.addInterPlayList(this.interPlayList); + this.interPlayList.clear(); + return; + } + + /** + * counting2è¦ç´ çµäºãåä¿¡ããã + */ + private void endCounting2(){ + endCounting(); + return; + } + + /** + * murderedè¦ç´ çµäºãåä¿¡ããã + */ + private void endMurdered(){ + this.sysEvent.addAvatarList(this.avatarList); + this.avatarList.clear(); + return; + } + + /** + * survivorè¦ç´ çµäºãåä¿¡ããã + */ + private void endSurvivor(){ + this.sysEvent.addAvatarList(this.avatarList); + this.avatarList.clear(); + return; + } + + /** + * suddenDeathè¦ç´ éå§ãåä¿¡ããã + * + * @param atts å±æ§ + */ + private void startSuddenDeath(Attributes atts){ + startSimpleAvatarAttr(atts); + return; + } + + /** + * vanishè¦ç´ éå§ãåä¿¡ããã + * + * @param atts å±æ§ + */ + private void startVanish(Attributes atts){ + startSimpleAvatarAttr(atts); + return; + } + + /** + * checkoutè¦ç´ éå§ãåä¿¡ããã + * + * @param atts å±æ§ + */ + private void startCheckOut(Attributes atts){ + startSimpleAvatarAttr(atts); + return; + } + + /** + * Avataråç§ãä¸ã¤ã ãå«ãè¦ç´ ãåä¿¡ããã + * + * @param atts å±æ§ + */ + private void startSimpleAvatarAttr(Attributes atts){ + String avatarId = attrValue(atts, "avatarId"); + Avatar avatar = this.idAvatarMap.get(avatarId); + List single = Collections.singletonList(avatar); + this.sysEvent.addAvatarList(single); + return; + } + + /** + * countingè¦ç´ éå§ãåä¿¡ããã + * + * @param atts å±æ§ + */ + private void startCounting(Attributes atts){ + String victimId = attrValue(atts, "victim"); + if(victimId == null) return; + Avatar victim = this.idAvatarMap.get(victimId); + List single = Collections.singletonList(victim); + this.sysEvent.addAvatarList(single); + return; + } + + /** + * judgeè¦ç´ éå§ãåä¿¡ããã + * + * @param atts å±æ§ + */ + private void startJudge(Attributes atts){ + startSimpleInterPlay(atts); + return; + } + + /** + * guardè¦ç´ éå§ãåä¿¡ããã + * + * @param atts å±æ§ + */ + private void startGuard(Attributes atts){ + startSimpleInterPlay(atts); + return; + } + + /** + * SystemEventåã®åä¸InterPlayãæ½åºããã + * + * @param atts å±æ§ + */ + private void startSimpleInterPlay(Attributes atts){ + String byWhomId = attrValue(atts, "byWhom"); + String targetId = attrValue(atts, "target"); + + Avatar byWhom = this.idAvatarMap.get(byWhomId); + Avatar target = this.idAvatarMap.get(targetId); + + InterPlay interPlay = new InterPlay(byWhom, target); + List single = Collections.singletonList(interPlay); + + this.sysEvent.addInterPlayList(single); + + return; + } + + /** + * SysEvent éå§ã®åä¿¡ã + * + * @param type SysEventç¨®å¥ + */ + private void startSysEvent(ElemTag tag, Attributes atts){ + this.sysEvent = new SysEvent(); + + SysEventType type = tag.getSystemEventType(); + EventFamily eventFamily = type.getEventFamily(); + this.sysEvent.setSysEventType(type); + this.sysEvent.setEventFamily(eventFamily); + + if(this.sysEvent.getSysEventType() == SysEventType.ASSAULT){ + startAssault(atts); + }else{ + switch(tag){ + case ONSTAGE: + startOnStage(atts); + break; + case PLAYERLIST: + startPlayerList(atts); + break; + case EXECUTION: + startExecution(atts); + break; + case SUDDENDEATH: + startSuddenDeath(atts); + break; + case COUNTING: + startCounting(atts); + break; + case JUDGE: + startJudge(atts); + break; + case GUARD: + startGuard(atts); + break; + case VANISH: + startVanish(atts); + break; + case CHECKOUT: + startCheckOut(atts); + break; + default: + break; + } + } + + this.content.setLength(0); + + return; + } + + /** + * SysEvent çµäºã®åä¿¡ã + * + * @return ãã¼ã¹ããSysEventã + */ + private void endSysEvent(){ + Topic topic; + SysEventType eventType = this.sysEvent.getSysEventType(); + if(eventType == SysEventType.ASSAULT){ + endAssault(); + topic = this.talk; + }else{ + switch(eventType){ + case PLAYERLIST: + endPlayerList(); + break; + case EXECUTION: + endExecution(); + break; + case COUNTING: + endCounting(); + break; + case COUNTING2: + endCounting2(); + break; + case MURDERED: + endMurdered(); + break; + case SURVIVOR: + endSurvivor(); + break; + default: + break; + } + + DecodedContent decoded = new DecodedContent(this.content); + this.sysEvent.setContent(decoded); + + topic = this.sysEvent; + } + + this.period.addTopic(topic); + + this.content.setLength(0); + this.sysEvent = null; + + return; + } + + /** + * assaultè¦ç´ éå§ã®åä¿¡ã + * + * @param atts å±æ§ + */ + private void startAssault(Attributes atts){ + String byWhom = attrValue(atts, "byWhom"); + String xname = attrValue(atts, "xname"); + String time = attrValue(atts, "time"); + + Avatar talkAvatar = this.idAvatarMap.get(byWhom); + + int hour = XmlDecoder.decodeHour (time); + int minute = XmlDecoder.decodeMinute(time); + + this.talk = new Talk( + this.period, + TalkType.WOLFONLY, talkAvatar, + 0, xname, + hour, minute, + "" + ); + + return; + } + + /** + * assaultè¦ç´ çµäºã®åä¿¡ã + */ + private void endAssault(){ + String dialog = this.content.toString(); + this.content.setLength(0); + + this.talk.setDialog(dialog); + + return; + } + + /** + * onStageè¦ç´ éå§ã®åä¿¡ã + * + * @param atts å±æ§ + */ + private void startOnStage(Attributes atts){ + String entryNo = attrValue(atts, "entryNo"); + String avatarId = attrValue(atts, "avatarId"); + + Avatar avatar = this.idAvatarMap.get(avatarId); + int entry = Integer.parseInt(entryNo); + + Player player = new Player(); + player.setAvatar(avatar); + player.setEntryNo(entry); + + this.sysEvent.addPlayerList(Collections.singletonList(player)); + + return; + } + + /** + * playerInfoè¦ç´ éå§ãåä¿¡ããã + * + * @param atts å±æ§ + */ + private void startPlayerInfo(Attributes atts) throws SAXException{ + String playerId = attrValue(atts, "playerId"); + String avatarId = attrValue(atts, "avatarId"); + String survive = attrValue(atts, "survive"); + String role = attrValue(atts, "role"); + String uri = attrValue(atts, "uri"); + + Avatar avatar = this.idAvatarMap.get(avatarId); + GameRole gameRole = XmlDecoder.decodeRole(role); + if(uri == null) uri = ""; + + Player player = new Player(); + + player.setAvatar(avatar); + player.setRole(gameRole); + player.setIdName(playerId); + player.setUrlText(uri); + if("true".equals(survive) || "1".equals(survive)){ + player.setObitDay(-1); + player.setDestiny(Destiny.ALIVE); + } + + this.playerList.add(player); + + return; + } + + /** + * nominatedè¦ç´ éå§ã®åä¿¡ã + * + * @param atts å±æ§ + */ + private void startNominated(Attributes atts){ + String avatarId = attrValue(atts, "avatarId"); + String countTxt = attrValue(atts, "count"); + + Avatar avatar = this.idAvatarMap.get(avatarId); + int count = Integer.parseInt(countTxt); + + Nominated nominated = new Nominated(avatar, count); + this.nominatedList.add(nominated); + + return; + } + + /** + * voteè¦ç´ éå§ãåä¿¡ããã + * + * @param atts å±æ§ + */ + private void startVote(Attributes atts){ + String byWhomId = attrValue(atts, "byWhom"); + String targetId = attrValue(atts, "target"); + + Avatar byWhom = this.idAvatarMap.get(byWhomId); + Avatar target = this.idAvatarMap.get(targetId); + + InterPlay interPlay = new InterPlay(byWhom, target); + this.interPlayList.add(interPlay); + + return; + } + + /** + * avatarRefè¦ç´ éå§ãåä¿¡ããã + * + * @param atts å±æ§ + */ + private void startAvatarRef(Attributes atts){ + String avatarId = attrValue(atts, "avatarId"); + Avatar avatar = this.idAvatarMap.get(avatarId); + this.avatarList.add(avatar); + return; + } + + /** + * {@inheritDoc} + * + * @param locator {@inheritDoc} + */ + @Override + public void setDocumentLocator(Locator locator) { + return; + } + + /** + * {@inheritDoc} + * + * @throws SAXException {@inheritDoc} + */ + @Override + public void startDocument() throws SAXException { + resetBefore(); + return; + } + + /** + * {@inheritDoc} + * + * @throws SAXException {@inheritDoc} + */ + @Override + public void endDocument() throws SAXException { + resetAfter(); + return; + } + + /** + * {@inheritDoc} + * + * @param prefix {@inheritDoc} + * @param uri {@inheritDoc} + * @throws SAXException {@inheritDoc} + */ + @Override + public void startPrefixMapping(String prefix, String uri) + throws SAXException { + if(NS_JINARCHIVE.equals(uri)){ + this.nsPfx = prefix; + this.qNameMap = ElemTag.getQNameMap(this.nsPfx); + } + return; + } + + /** + * {@inheritDoc} + * + * @param prefix {@inheritDoc} + * @throws SAXException {@inheritDoc} + */ + @Override + public void endPrefixMapping(String prefix) + throws SAXException { + return; + } + + /** + * {@inheritDoc} + * + * @param uri {@inheritDoc} + * @param localName {@inheritDoc} + * @param qName {@inheritDoc} + * @param atts {@inheritDoc} + * @throws SAXException {@inheritDoc} + */ + @Override + public void startElement(String uri, + String localName, + String qName, + Attributes atts) + throws SAXException { + ElemTag tag = decodeElemTag(uri, localName, qName); + if(tag == null) return; + + if(tag.isSysEventTag()){ + startSysEvent(tag, atts); + return; + } + + switch(tag){ + case VILLAGE: + startVillage(atts); + break; + case AVATAR: + startAvatar(atts); + break; + case PERIOD: + startPeriod(atts); + break; + case TALK: + startTalk(atts); + break; + case LI: + startLi(atts); + break; + case PLAYERINFO: + startPlayerInfo(atts); + break; + case NOMINATED: + startNominated(atts); + break; + case VOTE: + startVote(atts); + break; + case AVATARREF: + startAvatarRef(atts); + break; + default: + break; + } + + return; + } + + /** + * {@inheritDoc} + * + * @param uri {@inheritDoc} + * @param localName {@inheritDoc} + * @param qName {@inheritDoc} + * @throws SAXException {@inheritDoc} + */ + @Override + public void endElement(String uri, String localName, String qName) + throws SAXException { + ElemTag tag = decodeElemTag(uri, localName, qName); + if(tag == null) return; + + if(tag.isSysEventTag()){ + endSysEvent(); + return; + } + + switch(tag){ + case PERIOD: + endPeriod(); + break; + case TALK: + endTalk(); + break; + case LI: + endLi(); + break; + default: + break; + } + + return; + } + + /** + * {@inheritDoc} + * + * @param ch {@inheritDoc} + * @param start {@inheritDoc} + * @param length {@inheritDoc} + * @throws SAXException {@inheritDoc} + */ + @Override + public void characters(char[] ch, int start, int length) + throws SAXException { + if(!this.inLine) return; + this.content.append(ch, start, length); + return; + } + + /** + * {@inheritDoc} + * + * @param ch {@inheritDoc} + * @param start {@inheritDoc} + * @param length {@inheritDoc} + * @throws SAXException {@inheritDoc} + */ + @Override + public void ignorableWhitespace(char[] ch, int start, int length) + throws SAXException { + return; + } + + /** + * {@inheritDoc} + * + * @param target {@inheritDoc} + * @param data {@inheritDoc} + * @throws SAXException {@inheritDoc} + */ + @Override + public void processingInstruction(String target, String data) + throws SAXException { + return; + } + + /** + * {@inheritDoc} + * + * @param name {@inheritDoc} + * @throws SAXException {@inheritDoc} + */ + @Override + public void skippedEntity(String name) throws SAXException { + return; + } + +} diff --git a/src/main/java/jp/sfjp/jindolf/data/xml/VillageLoader.java b/src/main/java/jp/sfjp/jindolf/data/xml/VillageLoader.java new file mode 100644 index 0000000..b1d3fdc --- /dev/null +++ b/src/main/java/jp/sfjp/jindolf/data/xml/VillageLoader.java @@ -0,0 +1,255 @@ +/* + * village loader + * + * License : The MIT License + * Copyright(c) 2020 olyutorskii + */ + +package jp.sfjp.jindolf.data.xml; + +import java.io.BufferedInputStream; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Objects; +import javax.xml.XMLConstants; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.parsers.SAXParser; +import javax.xml.parsers.SAXParserFactory; +import javax.xml.validation.Schema; +import jp.sfjp.jindolf.data.Village; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; +import org.xml.sax.SAXNotRecognizedException; +import org.xml.sax.SAXNotSupportedException; +import org.xml.sax.XMLReader; + +/** + * JinArchiverãªã©ã§XMLãã¡ã¤ã«ã«ã¢ã¼ã«ã¤ããããäººç¼BBSã®æãã¬ã¤è¨é²ã + * èªã¿åãã + */ +public class VillageLoader { + + private static final String F_DISALLOW_DOCTYPE_DECL = + "http://apache.org/xml/features/disallow-doctype-decl"; + private static final String F_EXTERNAL_GENERAL_ENTITIES = + "http://xml.org/sax/features/external-general-entities"; + private static final String F_EXTERNAL_PARAMETER_ENTITIES = + "http://xml.org/sax/features/external-parameter-entities"; + private static final String F_LOAD_EXTERNAL_DTD = + "http://apache.org/xml/features/nonvalidating/load-external-dtd"; + private static final String F_NAMESPACE = + "http://xml.org/sax/features/namespaces"; + private static final String F_NAMESPACEPFX = + "http://xml.org/sax/features/namespace-prefixes"; + + + /** + * constructor. + */ + private VillageLoader(){ + assert false; + return; + } + + + /** + * XMLãã¡ã¤ã«ããã¼ã¹ããã + * + * @param xmlFile XMLãã¡ã¤ã« + * @return æ + * @throws IOException I/Oã¨ã©ã¼ + * @throws SAXException XMLã®å½¢å¼ã¨ã©ã¼ + */ + public static Village parseVillage(File xmlFile) + throws IOException, SAXException{ + Objects.nonNull(xmlFile); + + boolean isNormal; + isNormal = xmlFile.isFile() + && xmlFile.exists() + && xmlFile.canRead(); + if(!isNormal){ + throw new IOException(xmlFile.getPath() + "ãèªã¿è¾¼ããã¨ãã§ãã¾ãã"); + } + + Path path = xmlFile.toPath(); + + Village result = parseVillage(path); + return result; + } + + /** + * XMLãã¡ã¤ã«ããã¼ã¹ããã + * + * @param path XMLãã¡ã¤ã«ã®Path + * @return æ + * @throws IOException I/Oã¨ã©ã¼ + * @throws SAXException XMLã®å½¢å¼ã¨ã©ã¼ + */ + public static Village parseVillage(Path path) + throws IOException, SAXException{ + Objects.nonNull(path); + + path = path.normalize(); + + boolean isNormal; + isNormal = Files.exists(path) + && Files.isRegularFile(path) + && Files.isReadable(path); + if(!isNormal){ + throw new IOException(path.toString() + "ãèªã¿è¾¼ããã¨ãã§ãã¾ãã"); + } + + Village result; + try(InputStream is = pathToStream(path)){ + result = parseVillage(is); + } + + return result; + } + + /** + * Pathããå¥åã¹ããªã¼ã ãå¾ãã + * + * @param path Path + * @return ãããã¡ãªã³ã°ãããå¥åã¹ããªã¼ã + * @throws IOException I/Oã¨ã©ã¼ + */ + private static InputStream pathToStream(Path path) throws IOException{ + InputStream is; + is = Files.newInputStream(path); + is = new BufferedInputStream(is, 4*1024); + return is; + } + + /** + * XMLå¥åããã¼ã¹ããã + * + * @param istream XMLå¥å + * @return æ + * @throws IOException I/Oã¨ã©ã¼ + * @throws SAXException XMLã®å½¢å¼ã¨ã©ã¼ + */ + public static Village parseVillage(InputStream istream) + throws IOException, SAXException{ + InputSource isource = new InputSource(istream); + Village result = parseVillage(isource); + return result; + } + + /** + * XMLå¥åããã¼ã¹ããã + * + * @param isource XMLå¥å + * @return æ + * @throws IOException I/Oã¨ã©ã¼ + * @throws SAXException XMLã®å½¢å¼ã¨ã©ã¼ + */ + public static Village parseVillage(InputSource isource) + throws IOException, SAXException{ + XMLReader reader = buildReader(); + VillageHandler handler = new VillageHandler(); + reader.setContentHandler(handler); + + reader.parse(isource); + + Village result = handler.getVillage(); + return result; + } + + /** + * SAXãã¼ãµãã¡ã¯ããªãçæããã + * + *

XMLååç©ºéæ©è½ã¯æå¹ã«ãªãã + *
DTDã«ããå½¢å¼æ¤è¨¼ã¯ç¡å¹ã¨ãªãã + *
XIncludeã«ããå·®ãè¾¼ã¿æ©è½ã¯ç¡å¹ã¨ãªãã + *

+ * XML External Entity Prevention Cheat Sheet + *

ä¾: 22:49:00+09:00 ã® 22 + * + * @param txt å±æ§å¤ + * @return hourå¤ + */ + public static int decodeHour(String txt) { + int d1 = txt.charAt(0) - '0'; + int d0 = txt.charAt(1) - '0'; + int result = d1 * 10 + d0; + return result; + } + + /** + * minuteå¤ããã³ã¼ãããã + * + *

ä¾: 22:49:00+09:00 ã® 49 + * + * @param txt å±æ§å¤ + * @return minuteå¤ + */ + public static int decodeMinute(String txt) { + int d1 = txt.charAt(3) - '0'; + int d0 = txt.charAt(4) - '0'; + int result = d1 * 10 + d0; + return result; + } + + /** + * roleããã³ã¼ãããã + * + * @param role roleå±æ§å¤ + * @return GameRoleç¨®å¥ + * @throws SAXException ä¸æ£ãªå¤ + */ + static GameRole decodeRole(String role) throws SAXException { + GameRole result; + + switch (role) { + case "innocent": + result = GameRole.INNOCENT; + break; + case "wolf": + result = GameRole.WOLF; + break; + case "seer": + result = GameRole.SEER; + break; + case "shaman": + result = GameRole.SHAMAN; + break; + case "madman": + result = GameRole.MADMAN; + break; + case "hunter": + result = GameRole.HUNTER; + break; + case "frater": + result = GameRole.FRATER; + break; + case "hamster": + result = GameRole.HAMSTER; + break; + default: + assert false; + throw new SAXException("invalid role: " + role); + } + + return result; + } + +} diff --git a/src/main/java/jp/sfjp/jindolf/data/xml/package-info.java b/src/main/java/jp/sfjp/jindolf/data/xml/package-info.java new file mode 100644 index 0000000..9d1c510 --- /dev/null +++ b/src/main/java/jp/sfjp/jindolf/data/xml/package-info.java @@ -0,0 +1,15 @@ +/* + * package info + * + * License : The MIT License + * Copyright(c) 2020 olyutorskii + */ + +/** + * JinArchiverãªã©ã§XMLãã¡ã¤ã«ã«ã¢ã¼ã«ã¤ããããäººç¼BBSã®æãã¬ã¤è¨é²ããã + * åç¨®ãã¼ã¿ã¢ãã«ãçæããã¯ã©ã¹ç¾¤ã + */ + +package jp.sfjp.jindolf.data.xml; + +/* EOF */ diff --git a/src/main/java/jp/sfjp/jindolf/dxchg/WebIPCDialog.java b/src/main/java/jp/sfjp/jindolf/dxchg/WebIPCDialog.java index 1a81f60..8c4582b 100644 --- a/src/main/java/jp/sfjp/jindolf/dxchg/WebIPCDialog.java +++ b/src/main/java/jp/sfjp/jindolf/dxchg/WebIPCDialog.java @@ -563,7 +563,7 @@ public class WebIPCDialog extends JDialog { } /** - * D&Dã«æåããããã¤ã¢ãã°ãéããã + * D&Dã«æåããããã¤ã¢ãã°ãéããã * *

{@inheritDoc} * diff --git a/src/main/java/jp/sfjp/jindolf/dxchg/WolfBBS.java b/src/main/java/jp/sfjp/jindolf/dxchg/WolfBBS.java index 2dfed6b..c3e3d12 100644 --- a/src/main/java/jp/sfjp/jindolf/dxchg/WolfBBS.java +++ b/src/main/java/jp/sfjp/jindolf/dxchg/WolfBBS.java @@ -35,7 +35,7 @@ import jp.sourceforge.jindolf.corelib.GameRole; /** * ã¾ã¡ãæ°éå¶ã®ã¾ã¨ããµã¤ã(wolfbbs)ã«é¢ããè«¸ãã * - * PukiWikiãã¼ã¹ã + *

PukiWikiãã¼ã¹ã * * @see ã¾ã¨ããµã¤ã * @see PukiWiki @@ -341,7 +341,7 @@ public final class WolfBBS{ /** * æ°å¤åç§æåã«å¤æãããæåãè¿½å ããã * - * ä¾ï¼{@literal 'D' => "D}" + *

ä¾ï¼{@literal 'D' => "D}" * * @param app è¿½å å¯¾è±¡ * @param ch 1æå @@ -364,7 +364,7 @@ public final class WolfBBS{ /** * ä»»æã®æåãæ°å¤åç§æååã«å¤æããã * - * ä¾ï¼{@literal 'D' => "D"} + *

ä¾ï¼{@literal 'D' => "D"} * * @param ch æå * @return å¤æå¾ã®æåå @@ -383,7 +383,7 @@ public final class WolfBBS{ /** * Colorã®RGBåæåãWikiã«ã©ã¼è¡¨è¨ã«å¤æããã * - * Î±æåã¯ç¡è¦ãããã + *

Î±æåã¯ç¡è¦ãããã * * @param color è² * @return Wikiã«ã©ã¼è¡¨è¨ diff --git a/src/main/java/jp/sfjp/jindolf/editor/BalloonBorder.java b/src/main/java/jp/sfjp/jindolf/editor/BalloonBorder.java deleted file mode 100644 index 13601e7..0000000 --- a/src/main/java/jp/sfjp/jindolf/editor/BalloonBorder.java +++ /dev/null @@ -1,177 +0,0 @@ -/* - * baloon border - * - * License : The MIT License - * Copyright(c) 2008 olyutorskii - */ - -package jp.sfjp.jindolf.editor; - -import java.awt.BorderLayout; -import java.awt.Color; -import java.awt.Component; -import java.awt.Graphics; -import java.awt.Graphics2D; -import java.awt.Insets; -import java.awt.LayoutManager; -import java.awt.RenderingHints; -import javax.swing.JComponent; -import javax.swing.border.Border; - -/** - * ãããã·é¢¨Borderã - */ -public class BalloonBorder implements Border{ - - private static final int RADIUS = 5; - - - /** - * ã³ã³ã¹ãã©ã¯ã¿ã - */ - public BalloonBorder(){ - super(); - return; - } - - - /** - * ééãéæãªãããã·è£é£¾ãä»»æã®ã³ã³ãã¼ãã³ãã«æ½ãã - * @param inner è£é£¾å¯¾è±¡ã®ã³ã³ãã¼ãã³ã - * @return è£é£¾ãããã³ã³ãã¼ãã³ã - */ - public static JComponent decorateTransparentBorder(JComponent inner){ - JComponent result = new TransparentContainer(inner); - - Border border = new BalloonBorder(); - result.setBorder(border); - - return result; - } - - /** - * {@inheritDoc} - * @param comp {@inheritDoc} - * @return {@inheritDoc} - */ - @Override - public Insets getBorderInsets(Component comp){ - Insets insets = new Insets(RADIUS, RADIUS, RADIUS, RADIUS); - return insets; - } - - /** - * {@inheritDoc} - * å¿ãfalseãè¿ã(ãã®Borderã¯éæ)ã - * @return {@inheritDoc} - */ - @Override - public boolean isBorderOpaque(){ - return false; - } - - /** - * {@inheritDoc} - * @param comp {@inheritDoc} - * @param g {@inheritDoc} - * @param x {@inheritDoc} - * @param y {@inheritDoc} - * @param width {@inheritDoc} - * @param height {@inheritDoc} - */ - @Override - public void paintBorder(Component comp, - Graphics g, - int x, int y, - int width, int height ){ - final int diameter = RADIUS * 2; - final int innerWidth = width - diameter; - final int innerHeight = height - diameter; - - Graphics2D g2d = (Graphics2D) g; - - Color bgColor = comp.getBackground(); - g2d.setColor(bgColor); - - Object antiAliaseHint = - g2d.getRenderingHint(RenderingHints.KEY_ANTIALIASING); - g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, - RenderingHints.VALUE_ANTIALIAS_ON ); - - g2d.fillRect(x + RADIUS, y, - innerWidth, RADIUS); - g2d.fillRect(x, y + RADIUS, - RADIUS, innerHeight); - g2d.fillRect(x + RADIUS + innerWidth, y + RADIUS, - RADIUS, innerHeight); - g2d.fillRect(x + RADIUS, y + RADIUS + innerHeight, - innerWidth, RADIUS); - - int right = 90; // 90 degree right angle - - g2d.fillArc(x + innerWidth, y, - diameter, diameter, right * 0, right); - g2d.fillArc(x, y, - diameter, diameter, right * 1, right); - g2d.fillArc(x, y + innerHeight, - diameter, diameter, right * 2, right); - g2d.fillArc(x + innerWidth, y + innerHeight, - diameter, diameter, right * 3, right); - - g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, antiAliaseHint); - - return; - } - - /** - * éæã³ã³ããã - * 1ã¤ã®åãæã¡ãèæ¯è²æä½ãå§è²ããã - * ã¤ã¾ããã®ã³ã³ããã«Borderãè¨å®ããã¨åã®èæ¯è²ãåæ ãããã - */ - @SuppressWarnings("serial") - private static class TransparentContainer extends JComponent{ - - private final JComponent inner; - - /** - * ã³ã³ã¹ãã©ã¯ã¿ã - * @param inner åé¨ã³ã³ãã¼ãã³ã - */ - public TransparentContainer(JComponent inner){ - super(); - - this.inner = inner; - - setOpaque(false); - - LayoutManager layout = new BorderLayout(); - setLayout(layout); - add(this.inner, BorderLayout.CENTER); - - return; - } - - /** - * {@inheritDoc} - * åã®èæ¯è²ãè¿ãã - * @return {@inheritDoc} - */ - @Override - public Color getBackground(){ - Color bg = this.inner.getBackground(); - return bg; - } - - /** - * {@inheritDoc} - * èæ¯è²æå®ãããã¯ããåã®èæ¯è²ãæå®ããã - * @param bg {@inheritDoc} - */ - @Override - public void setBackground(Color bg){ - this.inner.setBackground(bg); - return; - } - } - -} diff --git a/src/main/java/jp/sfjp/jindolf/editor/EditArray.java b/src/main/java/jp/sfjp/jindolf/editor/EditArray.java deleted file mode 100644 index fbe8783..0000000 --- a/src/main/java/jp/sfjp/jindolf/editor/EditArray.java +++ /dev/null @@ -1,741 +0,0 @@ -/* - * ã¨ãã£ã¿éåã®æä½ - * - * License : The MIT License - * Copyright(c) 2008 olyutorskii - */ - -package jp.sfjp.jindolf.editor; - -import java.awt.Dimension; -import java.awt.EventQueue; -import java.awt.Font; -import java.awt.GridBagConstraints; -import java.awt.GridBagLayout; -import java.awt.LayoutManager; -import java.awt.Rectangle; -import java.awt.event.FocusEvent; -import java.awt.event.FocusListener; -import java.util.ArrayList; -import java.util.List; -import javax.swing.JPanel; -import javax.swing.Scrollable; -import javax.swing.SwingConstants; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; -import javax.swing.event.DocumentEvent; -import javax.swing.event.DocumentListener; -import javax.swing.text.BadLocationException; -import javax.swing.text.Document; -import javax.swing.text.JTextComponent; -import javax.swing.text.NavigationFilter; -import javax.swing.text.Position.Bias; - -/** - * ã¨ãã£ã¿éåã®æä½ã - * â» ãã®ã¯ã©ã¹ã¯ãã¹ã¦ã·ã³ã°ã«ã¹ã¬ããã¢ãã«ã§ä½ããã¦ããã - */ -@SuppressWarnings("serial") -public class EditArray extends JPanel - implements Scrollable, - FocusListener { - - private static final int MAX_EDITORS = 50; - - private final List editorList = new ArrayList<>(); - private boolean onAdjusting = false; - - private final NavigationFilter keyNavigator = new CustomNavigation(); - private final DocumentListener documentListener = new DocWatcher(); - - private TalkEditor activeEditor; - - private Font textFont; - - /** - * ã³ã³ã¹ãã©ã¯ã¿ã - */ - public EditArray(){ - super(); - - setOpaque(false); - - LayoutManager layout = new GridBagLayout(); - setLayout(layout); - - TalkEditor firstEditor = incrementTalkEditor(); - setActiveEditor(firstEditor); - - return; - } - - /** - * åå¥ã¨ãã£ã¿ã®çæãè¡ãã - * @return ã¨ãã£ã¿ - */ - private TalkEditor createTalkEditor(){ - TalkEditor editor = new TalkEditor(); - editor.setNavigationFilter(this.keyNavigator); - editor.addTextFocusListener(this); - Document document = editor.getDocument(); - document.addDocumentListener(this.documentListener); - - if(this.textFont == null){ - this.textFont = editor.getTextFont(); - }else{ - editor.setTextFont(this.textFont); - } - - return editor; - } - - /** - * ã¨ãã£ã¿éåãä¸ã¤å¢ããã - * @return å¢ããã¨ãã£ã¿ - */ - private TalkEditor incrementTalkEditor(){ - TalkEditor editor = createTalkEditor(); - - GridBagConstraints constraints = new GridBagConstraints(); - - constraints.gridx = 0; - constraints.gridy = GridBagConstraints.RELATIVE; - - constraints.gridwidth = GridBagConstraints.REMAINDER; - constraints.gridheight = 1; - - constraints.weightx = 1.0; - constraints.weighty = 0.0; - - constraints.fill = GridBagConstraints.HORIZONTAL; - constraints.anchor = GridBagConstraints.NORTHEAST; - - add(editor, constraints); - - this.editorList.add(editor); - - int sequenceNumber = this.editorList.size(); - editor.setSequenceNumber(sequenceNumber); - - return editor; - } - - /** - * 1ããå§ã¾ãéãçªå·æå®ã§ã¨ãã£ã¿ãåå¾ããã - * åå¨ããªãéãçªå·ãæå®ãããå ´åã¯æ°ãã«ã¨ãã£ã¿ãè¿½å ãããã - * @param sequenceNumber éãçªå· - * @return ã¨ãã£ã¿ - */ - private TalkEditor getTalkEditor(int sequenceNumber){ - while(this.editorList.size() < sequenceNumber){ - incrementTalkEditor(); - } - - TalkEditor result = this.editorList.get(sequenceNumber - 1); - - return result; - } - - /** - * æå®ããã¨ãã£ã¿ã®æ¬¡ã®éãçªå·ãæã¤ã¨ãã£ã¿ãè¿ãã - * ã¨ãã£ã¿ããªããã°è¿½å ãããã - * @param editor ã¨ãã£ã¿ - * @return æ¬¡ã®ã¨ãã£ã¿ - */ - private TalkEditor nextEditor(TalkEditor editor){ - int sequenceNumber = editor.getSequenceNumber(); - TalkEditor nextEditor = getTalkEditor(sequenceNumber + 1); - return nextEditor; - } - - /** - * æå®ããã¨ãã£ã¿ã®åã®éãçªå·ãæã¤ã¨ãã£ã¿ãè¿ãã - * @param editor ã¨ãã£ã¿ - * @return åã®ã¨ãã£ã¿ã - * æåã®ã¨ãã£ã¿(éãçªå·1)ãæå®ãããã°nullãè¿ãã - */ - private TalkEditor prevEditor(TalkEditor editor){ - int sequenceNumber = editor.getSequenceNumber(); - if(sequenceNumber <= 1) return null; - TalkEditor prevEditor = getTalkEditor(sequenceNumber - 1); - return prevEditor; - } - - /** - * æå®ããã¨ãã£ã¿ãã¨ãã£ã¿éåã®æå¾ã®ã¨ãã£ã¿ãå¤å®ããã - * @param editor ã¨ãã£ã¿ - * @return æå¾ã®ã¨ãã£ã¿ãªãtrue - */ - private boolean isLastEditor(TalkEditor editor){ - int seqNo = editor.getSequenceNumber(); - int size = this.editorList.size(); - if(seqNo >= size) return true; - return false; - } - - /** - * Documentãããã®æã¡ä¸»ã§ããã¨ãã£ã¿ãåå¾ããã - * @param document Documentã¤ã³ã¹ã¿ã³ã¹ - * @return æã¡ä¸»ã®ã¨ãã£ã¿ãè¦ã¤ãããªããã°nullã - */ - private TalkEditor getEditorFromDocument(Document document){ - for(TalkEditor editor : this.editorList){ - if(editor.getDocument() == document) return editor; - } - return null; - } - - /** - * ã¨ãã£ã¿éåããä»»æã®ã¨ãã£ã¿ãé¤ãã - * ãã ãæåã®ã¨ãã£ã¿ã¯æ¶å»ä¸å¯ã - * @param editor ã¨ãã£ã¿ - */ - private void removeEditor(TalkEditor editor){ - if(editor.getParent() != this) return; - - int seqNo = editor.getSequenceNumber(); - if(seqNo <= 1) return; - TalkEditor prevEditor = prevEditor(editor); - if(editor.isActive()){ - setActiveEditor(prevEditor); - } - if(editor.hasEditorFocus()){ - prevEditor.requestEditorFocus(); - } - - this.editorList.remove(seqNo - 1); - - editor.setNavigationFilter(null); - editor.removeTextFocusListener(this); - Document document = editor.getDocument(); - document.removeDocumentListener(this.documentListener); - editor.clearText(); - - remove(editor); - revalidate(); - - int renumber = 1; - for(TalkEditor newEditor : this.editorList){ - newEditor.setSequenceNumber(renumber++); - } - - return; - } - - /** - * ã¨ãã£ã¿éæåèª¿æ´ã¿ã¹ã¯ããã£ã¹ãããã¹ã¬ããã¨ãã¦äºå¾æå¥ããã - * ã¨ãã£ã¿éæåèª¿æ´ã¿ã¹ã¯ãå®è¡ä¸ã§ããã°ä½ãããªãã - * ãã£ããã¨ãªã£ãã¨ãã£ã¿ä¸ã§IMEæä½ãç¢ºå®ãã¦ããªããã°ä½ãããªãã - * @param triggerEvent ããã¥ã¡ã³ãå¤æ´ã¤ãã³ã - */ - private void detachAdjustTask(DocumentEvent triggerEvent){ - if(this.onAdjusting) return; - - Document document = triggerEvent.getDocument(); - final TalkEditor triggerEditor = getEditorFromDocument(document); - if(triggerEditor.onIMEoperation()) return; - - this.onAdjusting = true; - - EventQueue.invokeLater(new Runnable(){ - @Override - public void run(){ - try{ - adjustTask(triggerEditor); - }finally{ - EditArray.this.onAdjusting = false; - } - return; - } - }); - - return; - } - - /** - * ã¨ãã£ã¿éæåèª¿æ´ã¿ã¹ã¯æ¬ä½ã - * @param triggerEditor ã¿ã¹ã¯å®è¡ã®ãã£ããã¨ãªã£ãã¨ãã£ã¿ - */ - private void adjustTask(TalkEditor triggerEditor){ - int initCaretPos = triggerEditor.getCaretPosition(); - - TalkEditor newFocus = null; - int newCaretPos = -1; - - TalkEditor current = triggerEditor; - for(;;){ - TalkEditor next; - - if( ! isLastEditor(current) ){ - next = nextEditor(current); - String nextContents = next.getText(); - int nextLength = nextContents.length(); - - current.appendTail(nextContents); - String rest = current.chopRest(); - int restLength; - if(rest == null) restLength = 0; - else restLength = rest.length(); - - int chopLength = nextLength - restLength; - if(chopLength > 0){ - next.chopHead(chopLength); - }else if(chopLength < 0){ - rest = rest.substring(0, -chopLength); - next.appendHead(rest); - }else{ - if(newFocus == null){ - newFocus = current; - newCaretPos = initCaretPos; - } - break; - } - }else{ - String rest = current.chopRest(); - if(rest == null || this.editorList.size() >= MAX_EDITORS){ - if(newFocus == null){ - newFocus = current; - if(current.getTextLength() >= initCaretPos){ - newCaretPos = initCaretPos; - }else{ - newCaretPos = current.getTextLength(); - } - } - break; - } - next = nextEditor(current); - next.appendHead(rest); - } - - if(newFocus == null){ - int currentLength = current.getTextLength(); - if(initCaretPos >= currentLength){ - initCaretPos -= currentLength; - }else{ - newFocus = current; - newCaretPos = initCaretPos; - } - } - - current = next; - } - - if(newFocus != null){ - newFocus.requestEditorFocus(); - newFocus.setCaretPosition(newCaretPos); - } - - adjustEditorsTail(); - - return; - } - - /** - * ã¨ãã£ã¿éåæ«å°¾ã®ç©ºã¨ãã£ã¿ãåãè©°ããã - * ãã ãæåã®ã¨ãã£ã¿(éãçªå·1)ã¯åé¤ãããªãã - * ãã©ã¼ã«ã¹ãæã¤ã¨ãã£ã¿ãåé¤ãããå ´åã¯ã - * åé¤ãããªãã£ãæå¾ã®ã¨ãã£ã¿ã«ãã©ã¼ã«ã¹ãç§»ãã - */ - private void adjustEditorsTail(){ - int editorNum = this.editorList.size(); - if(editorNum <= 0) return; - TalkEditor lastEditor = this.editorList.get(editorNum - 1); - - TalkEditor prevlostEditor = null; - - boolean lostFocusedEditor = false; - - for(;;){ - int textLength = lastEditor.getTextLength(); - int seqNo = lastEditor.getSequenceNumber(); - - if(lostFocusedEditor){ - prevlostEditor = lastEditor; - } - - if(textLength > 0) break; - if(seqNo <= 1) break; - - if(lastEditor.hasEditorFocus()) lostFocusedEditor = true; - removeEditor(lastEditor); - - lastEditor = prevEditor(lastEditor); // TODO ã¡ãã£ã¨å¤ - } - - if(prevlostEditor != null){ - int textLength = prevlostEditor.getTextLength(); - prevlostEditor.requestEditorFocus(); - prevlostEditor.setCaretPosition(textLength); - } - - return; - } - - /** - * ãã©ã¼ã«ã¹ãæã¤ã¨ãã£ã¿ãåå¾ããã - * @return ã¨ãã£ã¿ - */ - public TalkEditor getFocusedTalkEditor(){ - for(TalkEditor editor : this.editorList){ - if(editor.hasEditorFocus()) return editor; - } - return null; - } - - /** - * ãã©ã¼ã«ã¹ãæã¤ã¨ãã£ã¿ã®æ¬¡ã¨ãã£ã¿ãããã°ãã©ã¼ã«ã¹ãç§»ãã - * ã«ã¬ããä½ç½®ã0ã«ããã - */ - // TODO ã¨ãã£ã¿ã®ã¹ã¯ãã¼ã«ä½ç½®èª¿æ´ãå¿è¦ã - public void forwardEditor(){ - TalkEditor editor = getFocusedTalkEditor(); - if(isLastEditor(editor)) return; - TalkEditor next = nextEditor(editor); - next.setCaretPosition(0); - next.requestEditorFocus(); - return; - } - - /** - * ãã©ã¼ã«ã¹ãæã¤ã¨ãã£ã¿ã®åã¨ãã£ã¿ãããã°ãã©ã¼ã«ã¹ãç§»ãã - * ã«ã¬ããä½ç½®ãæ«å°¾ã«ç½®ãã - */ - public void backwardEditor(){ - TalkEditor editor = getFocusedTalkEditor(); - TalkEditor prev = prevEditor(editor); - if(prev == null) return; - int length = prev.getTextLength(); - prev.setCaretPosition(length); - prev.requestEditorFocus(); - return; - } - - /** - * ä»»æã®ã¨ãã£ã¿ãã¢ã¯ãã£ãã«ããã - * åæã«ã¢ã¯ãã£ããªã¨ãã£ã¿ã¯ä¸ã¤ã®ã¿ã - * @param editor ã¢ã¯ãã£ãã«ããã¨ãã£ã¿ - */ - private void setActiveEditor(TalkEditor editor){ - if(this.activeEditor != null){ - this.activeEditor.setActive(false); - } - - this.activeEditor = editor; - - if(this.activeEditor != null){ - this.activeEditor.setActive(true); - } - - fireChangeActive(); - - return; - } - - /** - * ã¢ã¯ãã£ããªã¨ãã£ã¿ãè¿ãã - * @return ã¢ã¯ãã£ããªã¨ãã£ã¿ã - */ - public TalkEditor getActiveEditor(){ - return this.activeEditor; - } - - /** - * å¨çºè¨ãé£çµããæååãè¿ãã - * @return é£çµæåå - */ - public CharSequence getAllText(){ - StringBuilder result = new StringBuilder(); - - for(TalkEditor editor : this.editorList){ - String text = editor.getText(); - result.append(text); - } - - return result; - } - - /** - * åé ã¨ãã£ã¿ã®0æåç®ããåãè©°ãè¾¼ãã - * 2çªç®ç§»è¡ã®ã¨ãã£ã¿ã¸ã¯ã¿åºããããããªãã - * @param seq è©°ãè¾¼ãæåå - */ - public void setAllText(CharSequence seq){ - TalkEditor firstEditor = getTalkEditor(1); - Document doc = firstEditor.getDocument(); - try{ - doc.insertString(0, seq.toString(), null); - }catch(BadLocationException e){ - assert false; - } - return; - } - - /** - * å¨ã¨ãã£ã¿ãã¯ãªã¢ããã - */ - public void clearAllEditor(){ - int editorNum = this.editorList.size(); - if(editorNum <= 0) return; - - TalkEditor lastEditor = this.editorList.get(editorNum - 1); - for(;;){ - removeEditor(lastEditor); - lastEditor = prevEditor(lastEditor); - if(lastEditor == null) break; - } - - TalkEditor firstEditor = getTalkEditor(1); - firstEditor.clearText(); - setActiveEditor(firstEditor); - - return; - } - - /** - * ããã¹ãç·¨éç¨ãã©ã³ããæå®ããã - * @param textFont ãã©ã³ã - */ - public void setTextFont(Font textFont){ - this.textFont = textFont; - for(TalkEditor editor : this.editorList){ - editor.setTextFont(this.textFont); - editor.repaint(); - } - revalidate(); - return; - } - - /** - * ããã¹ãç·¨éç¨ãã©ã³ããåå¾ããã - * @return ãã©ã³ã - */ - public Font getTextFont(){ - return this.textFont; - } - - /** - * ã¢ã¯ãã£ãã¨ãã£ã¿å¤æ´éç¥ç¨ãªã¹ãã®ç»é²ã - * @param listener ãªã¹ã - */ - public void addChangeListener(ChangeListener listener){ - this.listenerList.add(ChangeListener.class, listener); - return; - } - - /** - * ã¢ã¯ãã£ãã¨ãã£ã¿å¤æ´éç¥ç¨ãªã¹ãã®åé¤ã - * @param listener ãªã¹ã - */ - public void removeChangeListener(ChangeListener listener){ - this.listenerList.remove(ChangeListener.class, listener); - return; - } - - /** - * ã¢ã¯ãã£ãã¨ãã£ã¿å¤æ´éç¥ãè¡ãã - */ - private void fireChangeActive(){ - ChangeEvent event = new ChangeEvent(this); - - ChangeListener[] listeners = - this.listenerList.getListeners(ChangeListener.class); - for(ChangeListener listener : listeners){ - listener.stateChanged(event); - } - - return; - } - - /** - * {@inheritDoc} - * ã¨ãã£ã¿ã®ãã©ã¼ã«ã¹åå¾ã¨ã¨ãã«ã¢ã¯ãã£ãç¶æã«ããã - * @param event {@inheritDoc} - */ - @Override - public void focusGained(FocusEvent event){ - Object source = event.getSource(); - if( ! (source instanceof JTextComponent) ) return; - JTextComponent textComp = (JTextComponent) source; - - Document document = textComp.getDocument(); - TalkEditor editor = getEditorFromDocument(document); - - setActiveEditor(editor); - - return; - } - - /** - * {@inheritDoc} - * @param event {@inheritDoc} - */ - @Override - public void focusLost(FocusEvent event){ - // NOTHING - return; - } - - /** - * {@inheritDoc} - * @return {@inheritDoc} - */ - @Override - public Dimension getPreferredScrollableViewportSize(){ - Dimension result = getPreferredSize(); - return result; - } - - /** - * {@inheritDoc} - * æ¨ªã¹ã¯ãã¼ã«ãã¼ãæ¥µååºããªãããã¬ã¤ã¢ã¦ãã§ããã°ãã - * @return {@inheritDoc} - */ - @Override - public boolean getScrollableTracksViewportWidth(){ - return true; - } - - /** - * {@inheritDoc} - * ç¸¦ã¹ã¯ãã¼ã«ãã¼ãåºãã¦ãè¯ãã®ã§ã¬ã¤ã¢ã¦ãã§ããã°ããªãã - * @return {@inheritDoc} - */ - @Override - public boolean getScrollableTracksViewportHeight(){ - return false; - } - - /** - * {@inheritDoc} - * @param visibleRect {@inheritDoc} - * @param orientation {@inheritDoc} - * @param direction {@inheritDoc} - * @return {@inheritDoc} - */ - @Override - public int getScrollableBlockIncrement(Rectangle visibleRect, - int orientation, - int direction ){ - if(orientation == SwingConstants.VERTICAL){ - return visibleRect.height; - } - return 10; - } - - /** - * {@inheritDoc} - * @param visibleRect {@inheritDoc} - * @param orientation {@inheritDoc} - * @param direction {@inheritDoc} - * @return {@inheritDoc} - */ - @Override - public int getScrollableUnitIncrement(Rectangle visibleRect, - int orientation, - int direction ){ - return 30; // TODO ãã©ã³ãé«ã®1.5åãããï¼ - } - - /** - * ã¨ãã£ã¿åã®ã«ã¼ã½ã«ç§»åãç£è¦ããããã®ã - * ã«ã¹ã¿ã åããããã²ã¼ã·ã§ã³ãã£ã«ã¿ã¼ã - * å¿è¦ã«å¿ãã¦ã¨ãã£ã¿éã«ã¼ã½ã«ç§»åãè¡ãã - */ - private class CustomNavigation extends NavigationFilter{ - - /** - * ã³ã³ã¹ãã©ã¯ã¿ã - */ - public CustomNavigation(){ - super(); - return; - } - - /** - * {@inheritDoc} - * ã«ã¼ã½ã«ç§»åãè¡ãè©°ã¾ã£ãå ´åã - * é£æ¥ããã¨ãã£ã¿éã§ã«ã¼ã½ã«ç§»åãè¡ãã - * @param text {@inheritDoc} - * @param pos {@inheritDoc} - * @param bias {@inheritDoc} - * @param direction {@inheritDoc} - * @param biasRet {@inheritDoc} - * @return {@inheritDoc} - * @throws javax.swing.text.BadLocationException {@inheritDoc} - */ - @Override - public int getNextVisualPositionFrom(JTextComponent text, - int pos, - Bias bias, - int direction, - Bias[] biasRet ) - throws BadLocationException { - int result = super.getNextVisualPositionFrom(text, - pos, - bias, - direction, - biasRet ); - if(result != pos) return result; - - switch(direction){ - case SwingConstants.WEST: - case SwingConstants.NORTH: - backwardEditor(); - break; - case SwingConstants.EAST: - case SwingConstants.SOUTH: - forwardEditor(); - break; - default: - assert false; - } - - return result; - } - } - - /** - * ã¨ãã£ã¿ã®åå®¹å¤æ´ãç£è¦ããéæã¨ãã£ã¿éèª¿æ´ãè¡ãã - */ - private class DocWatcher implements DocumentListener{ - - /** - * ã³ã³ã¹ãã©ã¯ã¿ã - */ - public DocWatcher(){ - super(); - return; - } - - /** - * {@inheritDoc} - * @param event {@inheritDoc} - */ - @Override - public void changedUpdate(DocumentEvent event){ - detachAdjustTask(event); - return; - } - - /** - * {@inheritDoc} - * @param event {@inheritDoc} - */ - @Override - public void insertUpdate(DocumentEvent event){ - detachAdjustTask(event); - return; - } - - /** - * {@inheritDoc} - * @param event {@inheritDoc} - */ - @Override - public void removeUpdate(DocumentEvent event){ - detachAdjustTask(event); - return; - } - } - -} diff --git a/src/main/java/jp/sfjp/jindolf/editor/TalkEditor.java b/src/main/java/jp/sfjp/jindolf/editor/TalkEditor.java deleted file mode 100644 index 17caa8f..0000000 --- a/src/main/java/jp/sfjp/jindolf/editor/TalkEditor.java +++ /dev/null @@ -1,551 +0,0 @@ -/* - * åç¨¿ä½ææ¯æ´ã¨ãã£ã¿ - * - * License : The MIT License - * Copyright(c) 2008 olyutorskii - */ - -package jp.sfjp.jindolf.editor; - -import java.awt.Color; -import java.awt.Dimension; -import java.awt.Font; -import java.awt.GridBagConstraints; -import java.awt.GridBagLayout; -import java.awt.Insets; -import java.awt.LayoutManager; -import java.awt.Rectangle; -import java.awt.event.FocusListener; -import javax.swing.BorderFactory; -import javax.swing.JComponent; -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.JPopupMenu; -import javax.swing.border.Border; -import javax.swing.event.DocumentEvent; -import javax.swing.event.DocumentListener; -import javax.swing.text.BadLocationException; -import javax.swing.text.Document; -import javax.swing.text.NavigationFilter; -import javax.swing.text.PlainDocument; -import javax.swing.text.Segment; -import jp.sfjp.jindolf.dxchg.TextPopup; - -/** - * åç¨¿ä½ææ¯æ´ã¨ãã£ã¿ã - * æåæ°è¡æ°ç®¡çãªã©ãè¡ãã - * 200æåãããã¯10è¡ã¾ã§å¥åå¯è½ã - * â» 10åç®ã«åºç¾ããæ¹è¡æåã¯è¨±ãããã - * â» 2010-11-27ä»¥éãGå½ã§ã¯5è¡å¶éã10è¡ã«ç·©åãããã - */ -@SuppressWarnings("serial") -public class TalkEditor - extends JPanel - implements DocumentListener { - - private static final int MAX_CHARS = 200; - private static final int MAX_LINES = 10; - - private static final Color COLOR_ACTIVATED = Color.GRAY; - - - private final PlainDocument document = new PlainDocument(); - - private int sequenceNumber; - - private boolean isActive = false; - - private final JLabel seqCount = new JLabel(); - private final JLabel talkStat = new JLabel(); - private final TextEditor textEditor = new TextEditor(); - - private Font textFont; - - - /** - * ã³ã³ã¹ãã©ã¯ã¿ã - * éãçªå·ã¯0ãæå®ãããã - */ - public TalkEditor(){ - this(0); - return; - } - - /** - * ã³ã³ã¹ãã©ã¯ã¿ã - * @param seqNumber éãçªå· - */ - @SuppressWarnings("LeakingThisInConstructor") - private TalkEditor(int seqNumber){ - super(); - - setOpaque(true); - - this.document.addDocumentListener(this); - - this.seqCount.setForeground(Color.WHITE); - this.talkStat.setForeground(Color.WHITE); - this.seqCount.setOpaque(false); - this.talkStat.setOpaque(false); - - this.textEditor.setMargin(new Insets(3, 3, 3, 3)); - this.textEditor.setDocument(this.document); - - JPopupMenu popup = new TextPopup(); - this.textEditor.setComponentPopupMenu(popup); - - this.textFont = this.textEditor.getFont(); - - setSequenceNumber(seqNumber); - updateStat(); - setActive(false); - - design(); - - return; - } - - - /** - * æå®ãããæååã®æå®ãããä½ç½®ããã - * æå¤§ä½æåã¾ã§1çºè¨ã«ããããäºãã§ãããå¤å®ããã - * @param source æ¤æ»å¯¾è±¡ - * @param start æ¤æ»éå§ä½ç½® - * @return 1çºè¨ã«ç´ãã¦ããé·ãã - */ - public static int choplimit(CharSequence source, int start){ - int length = source.length(); - if(start >= length) return 0; - - int chars = 0; - int lines = 0; - - for(int pos = start; pos < length; pos++){ - chars++; - if(chars >= MAX_CHARS) break; - char ch = source.charAt(pos); - if(ch == '\n'){ - lines++; - if(lines >= MAX_LINES) break; - } - } - - return chars; - } - - /** - * ã¬ã¤ã¢ã¦ããè¡ãã - */ - private void design(){ - LayoutManager layout = new GridBagLayout(); - GridBagConstraints constraints = new GridBagConstraints(); - - setLayout(layout); - - constraints.gridx = 0; - constraints.gridy = 0; - constraints.gridwidth = 1; - constraints.gridheight = 1; - constraints.weightx = 0.0; - constraints.weighty = 0.0; - constraints.fill = GridBagConstraints.NONE; - constraints.anchor = GridBagConstraints.NORTHWEST; - constraints.insets = new Insets(0, 0, 1, 3); - add(this.seqCount, constraints); - - constraints.gridx = 1; - constraints.gridy = 0; - constraints.gridwidth = 1; - constraints.gridheight = 2; - constraints.weightx = 1.0; - constraints.weighty = 0.0; - constraints.fill = GridBagConstraints.HORIZONTAL; - constraints.anchor = GridBagConstraints.NORTHWEST; - constraints.insets = new Insets(0, 0, 0, 0); - JComponent decorated = - BalloonBorder.decorateTransparentBorder(this.textEditor); - add(decorated, constraints); - - constraints.gridx = 0; - constraints.gridy = 1; - constraints.gridwidth = 1; - constraints.gridheight = 1; - constraints.weightx = 0.0; - constraints.weighty = 0.0; - constraints.fill = GridBagConstraints.NONE; - constraints.anchor = GridBagConstraints.NORTHEAST; - constraints.insets = new Insets(0, 0, 0, 3); - add(this.talkStat, constraints); - - Border border = BorderFactory.createEmptyBorder(5, 5, 5, 5); - setBorder(border); - - return; - } - - /** - * ããã¹ãç·¨éç¨ãã©ã³ããæå®ããã - * @param textFont ãã©ã³ã - */ - public void setTextFont(Font textFont){ - this.textFont = textFont; - this.textEditor.setFont(this.textFont); - this.textEditor.repaint(); - revalidate(); - return; - } - - /** - * ããã¹ãç·¨éç¨ãã©ã³ããåå¾ããã - * @return ãã©ã³ã - */ - public Font getTextFont(){ - return this.textFont; - } - - /** - * ããã¹ãã³ã³ãã¼ãã³ãã«NavigationFilterãè¨å®ããã - * @param navigator ããã²ã¼ã·ã§ã³ãã£ã«ã¿ - */ - public void setNavigationFilter(NavigationFilter navigator){ - this.textEditor.setNavigationFilter(navigator); - return; - } - - /** - * éãçªå·ãåå¾ããã - * @return éãçªå· - */ - public int getSequenceNumber(){ - return this.sequenceNumber; - } - - /** - * éãçªå·ãè¨å®ããã - * @param seqNumber éãçªå· - */ - public void setSequenceNumber(int seqNumber){ - this.sequenceNumber = seqNumber; - String seqText = "=== #" + this.sequenceNumber + " ==="; - this.seqCount.setText(seqText); - return; - } - - /** - * Documentãåå¾ããã - * @return ç®¡çä¸ã®Document - */ - public Document getDocument(){ - return this.document; - } - - /** - * ç¾å¨ã®ã¨ãã£ã¿ã®æåååå®¹ãåå¾ããã - * @return æåååå®¹ - */ - public String getText(){ - int length = this.document.getLength(); - String result = ""; - try{ - result = this.document.getText(0, length); - }catch(BadLocationException e){ - assert false; - } - return result; - } - - /** - * ç¾å¨ã®ã¨ãã£ã¿ã®æååé·ãåå¾ããã - * @return æååé· - */ - public int getTextLength(){ - return this.document.getLength(); - } - - /** - * ç¾å¨ã®è¡æ°ãåå¾ããã - * â» æ¹è¡æåã®ç·æ°ããä¸ã¤å¤ãå ´åãããã - * @return è¡æ° - */ - private int getTextLines(){ - int lines = 0; - - Segment segment = new Segment(); - segment.setPartialReturn(true); - - boolean hasLineContents = false; - int pos = 0; - int remain = getTextLength(); - while(remain > 0){ - try{ - this.document.getText(pos, remain, segment); - }catch(BadLocationException e){ - assert false; - } - - for(;;){ - char ch = segment.current(); - if(ch == Segment.DONE) break; - - if(ch == '\n'){ - if( ! hasLineContents ){ - lines++; - } - hasLineContents = false; - }else if( ! hasLineContents ){ - hasLineContents = true; - lines++; - } - - segment.next(); - } - - pos += segment.count; - remain -= segment.count; - } - - return lines; - } - - /** - * ã¨ãã£ã¿åé ã«æååãæ¿å¥ããã - * @param text æ¿å¥æåå - */ - public void appendHead(CharSequence text){ - if(text == null) return; - if(text.length() <= 0) return; - - try{ - this.document.insertString(0, text.toString(), null); - }catch(BadLocationException e){ - assert false; - } - - return; - } - - /** - * ã¨ãã£ã¿æ«å°¾ã«æååãè¿½å ããã - * @param text è¿½å æåå - */ - public void appendTail(CharSequence text){ - if(text == null) return; - if(text.length() <= 0) return; - - int offset = getTextLength(); - try{ - this.document.insertString(offset, text.toString(), null); - }catch(BadLocationException e){ - assert false; - } - - return; - } - - /** - * ã¨ãã£ã¿åé ããæååãåé¤ããã - * @param chopLength åé¤æåæ° - */ - public void chopHead(int chopLength){ - if(chopLength <= 0) return; - - int modLength; - int textLength = getTextLength(); - if(chopLength > textLength) modLength = textLength; - else modLength = chopLength; - - try{ - this.document.remove(0, modLength); - }catch(BadLocationException e){ - assert false; - } - - return; - } - - /** - * ããã¹ããç©ºã«ããã - */ - public void clearText(){ - int textLength = this.document.getLength(); - try{ - this.document.remove(0, textLength); - }catch(BadLocationException e){ - assert false; - } - return; - } - - /** - * ã¢ã¯ãã£ãç¶æãæå®ããã - * ã¢ã¯ãã£ãç¶æã®å ´åãèæ¯è²ãå¤ããã - * @param isActiveArg trueãªãã¢ã¯ãã£ãç¶æ - */ - public void setActive(boolean isActiveArg){ - this.isActive = isActiveArg; - - if(this.isActive){ - setOpaque(true); - setBackground(COLOR_ACTIVATED); - Dimension size = getSize(); - Rectangle bounds = new Rectangle(size); - scrollRectToVisible(bounds); - this.textEditor.scrollCaretToVisible(); - }else{ - setOpaque(false); - } - - repaint(); - - return; - } - - /** - * ã¢ã¯ãã£ãç¶æãåå¾ããã - * @return ã¢ã¯ãã£ãç¶æãªãtrue - */ - public boolean isActive(){ - return this.isActive; - } - - /** - * ã¨ãã£ã¿ãç¾å¨IMEæä½ä¸ãå¤å®ããã - * @return IMEæä½ä¸ãªãtrue - */ - public boolean onIMEoperation(){ - boolean result = this.textEditor.onIMEoperation(); - return result; - } - - /** - * ã¨ãã£ã¿ã®ç¾å¨ã®ã«ã¼ã½ã«ä½ç½®ãåå¾ããã - * @return 0ããå§ã¾ãã«ã¼ã½ã«ä½ç½® - */ - public int getCaretPosition(){ - int caretPos = this.textEditor.getCaretPosition(); - return caretPos; - } - - /** - * ã¨ãã£ã¿ã®ã«ã¼ã½ã«ä½ç½®ãè¨å®ããã - * @param pos 0ããå§ã¾ãã«ã¼ã½ã«ä½ç½® - * @throws java.lang.IllegalArgumentException ç¯å²å¤ã®ã«ã¼ã½ã«ä½ç½®æå® - */ - public void setCaretPosition(int pos) throws IllegalArgumentException{ - this.textEditor.setCaretPosition(pos); - return; - } - - /** - * éè¨æå ±è¡¨ç¤º(æåæ°ãè¡æ°)ãæ´æ°ããã - */ - private void updateStat(){ - if(onIMEoperation()) return; - - int charTotal = getTextLength(); - int lineNumber = getTextLines(); - - StringBuilder statistics = new StringBuilder(); - statistics.append(charTotal) - .append("å ") - .append(lineNumber) - .append("è¡"); - this.talkStat.setText(statistics.toString()); - - return; - } - - /** - * ãã®ããã¹ãã¨ãã£ã¿ã«åã¾ããªãæ«å°¾æç« ãåãåºãã - * @return æå°ã®æ«å°¾ææ¸ãä½è£ãããåãåºãå¿è¦ããªããã°nullãè¿ãã - */ - public String chopRest(){ - String text = getText(); - int textLength = getTextLength(); - int choppedlen = choplimit(text, 0); - - int restLength = textLength - choppedlen; - if(restLength <= 0) return null; - - String rest = null; - try{ - rest = this.document.getText(choppedlen, restLength); - this.document.remove(choppedlen, restLength); - }catch(BadLocationException e){ - assert false; - } - - return rest; - } - - /** - * ããã¹ãã¨ãã£ã¿ã«ãã©ã¼ã«ã¹ãè¨å®ããã - * @return çµ¶å¯¾å¤±æããå ´åã¯false - */ - public boolean requestEditorFocus(){ - boolean result = this.textEditor.requestFocusInWindow(); - return result; - } - - /** - * ããã¹ãã¨ãã£ã¿ããã©ã¼ã«ã¹ãä¿æãã¦ãããå¤å®ããã - * @return ãã©ã¼ã«ã¹ãä¿æãã¦ããã°true - */ - public boolean hasEditorFocus(){ - boolean result = this.textEditor.hasFocus(); - return result; - } - - /** - * åã¨ãã£ã¿ã®ãã©ã¼ã«ã¹ç£è¦ãªã¹ããç»é²ããã - * @param listener FocusListener - */ - public void addTextFocusListener(FocusListener listener){ - this.textEditor.addFocusListener(listener); - return; - } - - /** - * åã¨ãã£ã¿ãããã©ã¼ã«ã¹ç£è¦ãªã¹ããå¤ãã - * @param listener FocusListener - */ - public void removeTextFocusListener(FocusListener listener){ - this.textEditor.removeFocusListener(listener); - return; - } - - /** - * {@inheritDoc} - * éè¨æå ±ãæ´æ°ããã - * @param event {@inheritDoc} - */ - // TODO ãã¤å¼ã°ããã®ãä¸æ - @Override - public void changedUpdate(DocumentEvent event){ - updateStat(); - return; - } - - /** - * {@inheritDoc} - * éè¨æå ±ãæ´æ°ããã - * @param event {@inheritDoc} - */ - @Override - public void insertUpdate(DocumentEvent event){ - updateStat(); - return; - } - - /** - * {@inheritDoc} - * éè¨æå ±ãæ´æ°ããã - * @param event {@inheritDoc} - */ - @Override - public void removeUpdate(DocumentEvent event){ - updateStat(); - return; - } - -} diff --git a/src/main/java/jp/sfjp/jindolf/editor/TalkPreview.java b/src/main/java/jp/sfjp/jindolf/editor/TalkPreview.java deleted file mode 100644 index 9a04c43..0000000 --- a/src/main/java/jp/sfjp/jindolf/editor/TalkPreview.java +++ /dev/null @@ -1,516 +0,0 @@ -/* - * çºè¨ã¨ãã£ããããã« - * - * License : The MIT License - * Copyright(c) 2008 olyutorskii - */ - -package jp.sfjp.jindolf.editor; - -import java.awt.BorderLayout; -import java.awt.Color; -import java.awt.Container; -import java.awt.Font; -import java.awt.GridBagConstraints; -import java.awt.GridBagLayout; -import java.awt.Insets; -import java.awt.LayoutManager; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.io.File; -import javax.swing.BorderFactory; -import javax.swing.JButton; -import javax.swing.JComponent; -import javax.swing.JFrame; -import javax.swing.JLabel; -import javax.swing.JOptionPane; -import javax.swing.JPanel; -import javax.swing.JPopupMenu; -import javax.swing.JScrollPane; -import javax.swing.JSplitPane; -import javax.swing.JViewport; -import javax.swing.border.BevelBorder; -import javax.swing.border.Border; -import javax.swing.border.TitledBorder; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; -import javax.swing.text.JTextComponent; -import jp.sfjp.jindolf.dxchg.ClipboardAction; -import jp.sfjp.jindolf.dxchg.TextPopup; -import jp.sfjp.jindolf.glyph.FontInfo; -import jp.sfjp.jindolf.util.GUIUtils; -import jp.sourceforge.jovsonz.JsArray; -import jp.sourceforge.jovsonz.JsComposition; -import jp.sourceforge.jovsonz.JsObject; -import jp.sourceforge.jovsonz.JsString; -import jp.sourceforge.jovsonz.JsTypes; -import jp.sourceforge.jovsonz.JsValue; - -/** - * çºè¨ã¨ãã£ããããã«ã - */ -@SuppressWarnings("serial") -public class TalkPreview extends JFrame - implements ActionListener, ChangeListener{ - - /** åç¨¿ãã¡ã¤ã«ã */ - public static final File DRAFT_FILE = new File("draft.json"); - - private static final Color COLOR_EDITORBACK = Color.BLACK; - - private final JTextComponent freeMemo = new TextEditor(); - - private final EditArray editArray = new EditArray(); - - private final JButton cutButton = new JButton("ã«ãã"); - private final JButton copyButton = new JButton("ã³ãã¼"); - private final JButton clearButton = new JButton("ã¯ãªã¢"); - private final JButton cutAllButton = new JButton("å¨ã«ãã"); - private final JButton copyAllButton = new JButton("å¨ã³ãã¼"); - private final JButton clearAllButton = new JButton("å¨ã¯ãªã¢"); - private final JButton closeButton = new JButton("éãã"); - private final TitledBorder numberBorder = - BorderFactory.createTitledBorder(""); - private final JComponent singleGroup = buildSingleGroup(); - private final JComponent multiGroup = buildMultiGroup(); - private final JLabel letsBrowser = - new JLabel("æç¨¿ã¯Webãã©ã¦ã¶ããã©ãã"); - - private JsObject loadedDraft = null; - - /** - * ã³ã³ã¹ãã©ã¯ã¿ã - */ - @SuppressWarnings("LeakingThisInConstructor") - public TalkPreview(){ - super(); - - GUIUtils.modifyWindowAttributes(this, true, false, true); - - setDefaultCloseOperation(HIDE_ON_CLOSE); - - this.cutButton .addActionListener(this); - this.copyButton .addActionListener(this); - this.clearButton .addActionListener(this); - this.cutAllButton .addActionListener(this); - this.copyAllButton .addActionListener(this); - this.clearAllButton .addActionListener(this); - this.closeButton .addActionListener(this); - - this.editArray.addChangeListener(this); - - Container content = getContentPane(); - design(content); - - setBorderNumber(1); - - return; - } - - /** - * ã¬ã¤ã¢ã¦ããè¡ãã - * @param content ã³ã³ãã - */ - private void design(Container content){ - JComponent freeNotePanel = buildFreeNotePanel(); - - JScrollPane scrollPane = new JScrollPane(); - scrollPane.setHorizontalScrollBarPolicy( - JScrollPane.HORIZONTAL_SCROLLBAR_NEVER - ); - JViewport viewPort = new JViewport(); - viewPort.setBackground(COLOR_EDITORBACK); - viewPort.setView(this.editArray); - scrollPane.setViewport(viewPort); - - LayoutManager layout; - Border border; - - JComponent editPanel = new JPanel(); - layout = new BorderLayout(); - editPanel.setLayout(layout); - editPanel.add(scrollPane, BorderLayout.CENTER); - JComponent buttonPanel = buildButtonPanel(); - editPanel.add(buttonPanel, BorderLayout.EAST); - border = BorderFactory.createTitledBorder("çºè¨ç·¨é"); - editPanel.setBorder(border); - - JSplitPane split = new JSplitPane(); - split.setOrientation(JSplitPane.HORIZONTAL_SPLIT); - split.setContinuousLayout(false); - split.setDividerSize(10); - split.setDividerLocation(200); - split.setOneTouchExpandable(true); - split.setLeftComponent(freeNotePanel); - split.setRightComponent(editPanel); - - Border inside = BorderFactory.createBevelBorder(BevelBorder.LOWERED); - Border outside = BorderFactory.createEmptyBorder(2, 5, 2, 2); - border = BorderFactory.createCompoundBorder(inside, outside); - this.letsBrowser.setBorder(border); - - layout = new BorderLayout(); - content.setLayout(layout); - content.add(split, BorderLayout.CENTER); - content.add(this.letsBrowser, BorderLayout.SOUTH); - - return; - } - - /** - * ãã¿ã³ç¾¤ãçæããã - * @return ãã¿ã³ç¾¤ - */ - private JComponent buildButtonPanel(){ - JPanel panel = new JPanel(); - - LayoutManager layout = new GridBagLayout(); - GridBagConstraints constraints = new GridBagConstraints(); - - panel.setLayout(layout); - - constraints.weightx = 1.0; - constraints.weighty = 0.0; - constraints.fill = GridBagConstraints.NONE; - constraints.anchor = GridBagConstraints.WEST; - constraints.gridx = 1; - constraints.gridy = GridBagConstraints.RELATIVE; - constraints.gridwidth = 1; - constraints.gridheight = 1; - - - constraints.insets = new Insets(3, 3, 3, 3); - panel.add(this.singleGroup, constraints); - - constraints.insets = new Insets(10, 3, 3, 3); - panel.add(this.multiGroup, constraints); - - constraints.weighty = 1.0; - constraints.anchor = GridBagConstraints.SOUTH; - constraints.insets = new Insets(3, 3, 10, 3); - panel.add(this.closeButton, constraints); - - return panel; - } - - /** - * ã¢ã¯ãã£ãçºè¨æä½ãã¿ã³ç¾¤ãçæããã - * @return ãã¿ã³ç¾¤ - */ - private JComponent buildSingleGroup(){ - JComponent panel = new JPanel(); - - LayoutManager layout = new GridBagLayout(); - GridBagConstraints constraints = new GridBagConstraints(); - - panel.setLayout(layout); - - constraints.weightx = 1.0; - constraints.weighty = 0.0; - constraints.fill = GridBagConstraints.HORIZONTAL; - constraints.gridx = 1; - constraints.gridy = GridBagConstraints.RELATIVE; - constraints.gridwidth = 1; - constraints.gridheight = 1; - constraints.insets = new Insets(3, 3, 3, 3); - - panel.add(this.cutButton, constraints); - panel.add(this.copyButton, constraints); - panel.add(this.clearButton, constraints); - - panel.setBorder(this.numberBorder); - - return panel; - } - - /** - * å¨çºè¨æä½ãã¿ã³ç¾¤ãçæããã - * @return ãã¿ã³ç¾¤ - */ - private JComponent buildMultiGroup(){ - JComponent panel = new JPanel(); - - LayoutManager layout = new GridBagLayout(); - GridBagConstraints constraints = new GridBagConstraints(); - - panel.setLayout(layout); - - constraints.weightx = 1.0; - constraints.weighty = 0.0; - constraints.fill = GridBagConstraints.HORIZONTAL; - constraints.gridx = 1; - constraints.gridy = GridBagConstraints.RELATIVE; - constraints.gridwidth = 1; - constraints.gridheight = 1; - constraints.insets = new Insets(3, 3, 3, 3); - - panel.add(this.cutAllButton, constraints); - panel.add(this.copyAllButton, constraints); - panel.add(this.clearAllButton, constraints); - - Border border = BorderFactory.createTitledBorder("å¨çºè¨ã"); - panel.setBorder(border); - - return panel; - } - - /** - * ããªã¼ãã¼ãé¨ãçæããã - * @return ããªã¼ãã¼ãé¨ - */ - private JComponent buildFreeNotePanel(){ - Insets margin = new Insets(3, 3, 3, 3); - this.freeMemo.setMargin(margin); - JPopupMenu popup = new TextPopup(); - this.freeMemo.setComponentPopupMenu(popup); - - JScrollPane scrollPane = new JScrollPane(); - scrollPane.setHorizontalScrollBarPolicy( - JScrollPane.HORIZONTAL_SCROLLBAR_NEVER - ); - JViewport viewPort = new JViewport(); - viewPort.setView(this.freeMemo); - scrollPane.setViewport(viewPort); - - JComponent panel = new JPanel(); - - LayoutManager layout = new GridBagLayout(); - GridBagConstraints constraints = new GridBagConstraints(); - - panel.setLayout(layout); - - constraints.weightx = 1.0; - constraints.weighty = 1.0; - constraints.fill = GridBagConstraints.BOTH; - constraints.insets = new Insets(1, 1, 1, 1); - panel.add(scrollPane, constraints); - - Border border = BorderFactory.createTitledBorder("ããªã¼ã¡ã¢"); - panel.setBorder(border); - - return panel; - } - - /** - * ã¢ã¯ãã£ãçºè¨ã®éãçªå·è¡¨ç¤ºãæ´æ°ã - * @param num éãçªå· - */ - private void setBorderNumber(int num){ - String title = "çºè¨#"+num+" ã"; - this.numberBorder.setTitle(title); - this.singleGroup.revalidate(); - this.singleGroup.repaint(); - return; - } - - /** - * ããã¹ãç·¨éç¨ãã©ã³ããæå®ããã - * æç»å±æ§ã¯ç¡è¦ãããã - * @param fontInfo ãã©ã³ãè¨å® - */ - public void setFontInfo(FontInfo fontInfo){ - setTextFont(fontInfo.getFont()); - return; - } - - /** - * ããã¹ãç·¨éç¨ãã©ã³ããæå®ããã - * @param textFont ãã©ã³ã - */ - public void setTextFont(Font textFont){ - this.freeMemo.setFont(textFont); - this.editArray.setTextFont(textFont); - return; - } - - /** - * ããã¹ãç·¨éç¨ãã©ã³ããåå¾ããã - * @return ãã©ã³ã - */ - public Font getTextFont(){ - return this.editArray.getTextFont(); - } - - /** - * çºè¨ã¯ãªã¢æä½ã®ç¢ºèªãã¤ã¢ãã°ãè¡¨ç¤ºããã - * @return OKãªã0, Cancelãªã2 - */ - private int warnClear(){ - int result = JOptionPane.showConfirmDialog( - this, - "æ¬å½ã«çºè¨ãã¯ãªã¢ãã¦ãããã§ããï¼", - "çºè¨ã¯ãªã¢ç¢ºèª", - JOptionPane.OK_CANCEL_OPTION, - JOptionPane.QUESTION_MESSAGE ); - return result; - } - - /** - * JSONå½¢å¼ã®åç¨¿æå ±ãè¿ãã - * @return JSONå½¢å¼ã®åç¨¿æå ± - */ - public JsObject getJson(){ - JsObject result = new JsObject(); - JsString memo = new JsString(this.freeMemo.getText()); - result.putValue("freeMemo", memo); - - JsArray array = new JsArray(); - JsString text = new JsString(this.editArray.getAllText()); - array.add(text); - result.putValue("drafts", array); - - return result; - } - - /** - * JSONå½¢å¼ã®åç¨¿æå ±ãåæ ãããã - * @param root JSONå½¢å¼ã®åç¨¿æå ±ãnullãæ¥ããä½ãããªã - */ - public void putJson(JsObject root){ - if(root == null) return; - - JsValue value; - - value = root.getValue("freeMemo"); - if(value.getJsTypes() == JsTypes.STRING){ - JsString memo = (JsString) value; - this.freeMemo.setText(memo.toRawString()); - } - - value = root.getValue("drafts"); - if(value.getJsTypes() != JsTypes.ARRAY) return; - JsArray array = (JsArray) value; - - StringBuilder draftAll = new StringBuilder(); - for(JsValue elem : array){ - if(elem.getJsTypes() != JsTypes.STRING) continue; - JsString draft = (JsString) elem; - draftAll.append(draft.toRawString()); - } - this.editArray.clearAllEditor(); - this.editArray.setAllText(draftAll); - - this.loadedDraft = root; - - return; - } - - /** - * èµ·åæã®åç¨¿ã¨çä¾¡ãå¤å®ããã - * @param conf æ¯è¼å¯¾è±¡ - * @return çä¾¡ãªãtrue - */ - public boolean hasConfChanged(JsComposition conf){ - if(this.loadedDraft != null){ - if(this.loadedDraft.equals(conf)) return true; - } - return false; - } - - /** - * ã¢ã¯ãã£ããªçºè¨ãã«ãããã¯ãªãããã¼ãã¸ã³ãã¼ããã - */ - private void actionCutActive(){ - actionCopyActive(); - actionClearActive(false); - return; - } - - /** - * ã¢ã¯ãã£ããªçºè¨ãã¯ãªãããã¼ãã«ã³ãã¼ããã - */ - private void actionCopyActive(){ - TalkEditor activeEditor = this.editArray.getActiveEditor(); - if(activeEditor == null) return; - - CharSequence text = activeEditor.getText(); - ClipboardAction.copyToClipboard(text); - - return; - } - - /** - * ã¢ã¯ãã£ããªçºè¨ãã¯ãªã¢ããã - * @param confirm trueãªãç¢ºèªãã¤ã¢ãã°ãåºã - */ - private void actionClearActive(boolean confirm){ - if(confirm && warnClear() != 0 ) return; - - TalkEditor activeEditor = this.editArray.getActiveEditor(); - if(activeEditor == null) return; - - activeEditor.clearText(); - - return; - } - - /** - * å¨çºè¨ãã«ãããã¯ãªãããã¼ãã¸ã³ãã¼ããã - */ - private void actionCutAll(){ - actionCopyAll(); - actionClearAll(false); - return; - } - - /** - * å¨çºè¨ãã¯ãªãããã¼ãã«ã³ãã¼ããã - */ - private void actionCopyAll(){ - CharSequence text = this.editArray.getAllText(); - ClipboardAction.copyToClipboard(text); - return; - } - - /** - * å¨çºè¨ãã¯ãªã¢ããã - * @param confirm trueãªãç¢ºèªãã¤ã¢ãã°ãåºã - */ - private void actionClearAll(boolean confirm){ - if(confirm && warnClear() != 0 ) return; - this.editArray.clearAllEditor(); - return; - } - - /** - * ä¸ä½ã¦ã£ã³ãã¦ãã¯ãã¼ãºããã - */ - private void actionClose(){ - setVisible(false); - return; - } - - /** - * {@inheritDoc} - * åç¨®ãã¿ã³æä½ã®å¦çã - * @param event {@inheritDoc} - */ - @Override - public void actionPerformed(ActionEvent event){ - Object source = event.getSource(); - if (source == this.cutButton) actionCutActive(); - else if(source == this.copyButton) actionCopyActive(); - else if(source == this.clearButton) actionClearActive(true); - else if(source == this.cutAllButton) actionCutAll(); - else if(source == this.copyAllButton) actionCopyAll(); - else if(source == this.clearAllButton) actionClearAll(true); - else if(source == this.closeButton) actionClose(); - return; - } - - /** - * ã¢ã¯ãã£ããªã¨ãã£ã¿ãå¤æ´ãããæã®å¦çã - * @param event ã¤ãã³ãæå ± - */ - @Override - public void stateChanged(ChangeEvent event){ - TalkEditor activeEditor = this.editArray.getActiveEditor(); - int seqNo = activeEditor.getSequenceNumber(); - setBorderNumber(seqNo); - return; - } - - // TODO ã¢ã³ãã¥ã»ãªãã¥æ©è½ - // TODO ãã«ã¼ã³ã®é°å²æ°ãé¸æã§ããããã«ãããã(ç½ãèµ¤ãéãç°) - // TODO ã¢ã³ã«ã¼ã®è¡¨è¨æºãã®ææ -} diff --git a/src/main/java/jp/sfjp/jindolf/editor/TextEditor.java b/src/main/java/jp/sfjp/jindolf/editor/TextEditor.java deleted file mode 100644 index 6ada0d2..0000000 --- a/src/main/java/jp/sfjp/jindolf/editor/TextEditor.java +++ /dev/null @@ -1,285 +0,0 @@ -/* - * åç¨¿ä½ææ¯æ´ç¨ããã¹ãã³ã³ãã¼ãã³ã - * - * License : The MIT License - * Copyright(c) 2008 olyutorskii - */ - -package jp.sfjp.jindolf.editor; - -import java.awt.Rectangle; -import java.awt.event.InputMethodEvent; -import java.awt.event.InputMethodListener; -import java.nio.CharBuffer; -import java.text.AttributedCharacterIterator; -import javax.swing.JTextArea; -import javax.swing.text.AbstractDocument; -import javax.swing.text.AttributeSet; -import javax.swing.text.BadLocationException; -import javax.swing.text.Document; -import javax.swing.text.DocumentFilter; -import javax.swing.text.DocumentFilter.FilterBypass; -import javax.swing.text.PlainDocument; - -/** - * åç¨¿ä½ææ¯æ´ç¨ããã¹ãã³ã³ãã¼ãã³ãã - */ -@SuppressWarnings("serial") -public class TextEditor extends JTextArea - implements InputMethodListener { - - private static final int MAX_DOCUMENT = 10 * 1000; - - private final DocumentFilter documentFilter = new CustomFilter(); - - private boolean onIMEoperation = false; - - /** - * ã³ã³ã¹ãã©ã¯ã¿ã - */ - @SuppressWarnings("LeakingThisInConstructor") - public TextEditor(){ - super(); - - setLineWrap(true); - setWrapStyleWord(false); - - Document document = new PlainDocument(); - setDocument(document); - - addInputMethodListener(this); - - return; - } - - /** - * ã¨ãã£ã¿ãç¾å¨IMEæä½ä¸ãå¤å®ããã - * @return IMEæä½ä¸ãªãtrue - */ - public boolean onIMEoperation(){ - return this.onIMEoperation; - } - - /** - * ç¾å¨ã®ã«ã¼ã½ã«ãè¡¨ç¤ºãããããã¹ã¯ãã¼ã«ã¨ãªã¢ãæä½ããã - */ - public void scrollCaretToVisible(){ - int caretPosition = getCaretPosition(); - - Rectangle caretBounds; - try{ - caretBounds = modelToView(caretPosition); - }catch(BadLocationException e){ - assert false; - return; - } - - scrollRectToVisible(caretBounds); - - return; - } - - /** - * {@inheritDoc} - * Documentå¤æ´ãããã¯ãã¦ãã£ã«ã¿ãä»è¾¼ãã - * @param document {@inheritDoc} - */ - @Override - public final void setDocument(Document document){ - Document oldDocument = getDocument(); - if(oldDocument instanceof AbstractDocument){ - AbstractDocument abstractDocument = - (AbstractDocument) oldDocument; - abstractDocument.setDocumentFilter(null); - } - - super.setDocument(document); - - if(document instanceof AbstractDocument){ - AbstractDocument abstractDocument = (AbstractDocument) document; - abstractDocument.setDocumentFilter(this.documentFilter); - } - - return; - } - - /** - * {@inheritDoc} - * ãã®ã¨ãã£ã¿ä¸ã®æå®é åãè¡¨ç¤ºãããããã¹ã¯ãã¼ã«ã¨ãªã¢ãæä½ããã - * ãã¼ãã¼ããã©ã¼ã«ã¹ãä¿æããªãã¨ãã¯ç¡è¦ã - * @param rect {@inheritDoc} - */ - @Override - public void scrollRectToVisible(Rectangle rect){ - if( ! hasFocus() ) return; - super.scrollRectToVisible(rect); - return; - } - - /** - * {@inheritDoc} - * @param event {@inheritDoc} - */ - @Override - public void caretPositionChanged(InputMethodEvent event){ - // NOTHING - return; - } - - /** - * {@inheritDoc} - * ãã®ããã¹ãã¨ãã£ã¿ã§ç¾å¨IMEã®å¤æä¸ãå¦ãå¤å®ããå¦çãå«ãã - * @param event {@inheritDoc} - */ - @Override - public void inputMethodTextChanged(InputMethodEvent event){ - int committed = event.getCommittedCharacterCount(); - AttributedCharacterIterator aci = event.getText(); - if(aci == null){ - this.onIMEoperation = false; - return; - } - int begin = aci.getBeginIndex(); - int end = aci.getEndIndex(); - int span = end - begin; - - if(committed >= span) this.onIMEoperation = false; - else this.onIMEoperation = true; - - return; - } - - /** - * å¥åæååã«å¶éãå ããDocumentFilterã - * \n,\f ä»¥å¤ã®å¶å¾¡æåã¯ã¿ããå«ãå¥åç¦æ¢ã - * U+FFFF ã¯java.textããã±ã¼ã¸ã§ç¹å¥æ±ããªã®ã§ãããå¥åç¦æ¢ã - * â» ãã ãIMEæä½ä¸ã¯å¶éãªãã - */ - private class CustomFilter extends DocumentFilter{ - - /** - * ã³ã³ã¹ãã©ã¯ã¿ã - */ - public CustomFilter(){ - super(); - return; - } - - /** - * å¥åç¦æ¢æåã®å¤å®ã - * @param ch æ¤æ»å¯¾è±¡æå - * @return å¥åç¦æ¢ãªãfalseããã ãIMEæä½ä¸ã¯å¿ãtrueã - */ - private boolean isValid(char ch){ - if(onIMEoperation()) return true; - - if(ch == '\n') return true; -// if(ch == '\f') return true; - - if(ch == '\uffff') return false; - if(Character.isISOControl(ch)) return false; - -// if( ! CodeX0208.isValid(ch) ) return false; - if(Character.isHighSurrogate(ch)) return false; - if(Character.isLowSurrogate(ch) ) return false; - - return true; - } - - /** - * ä¸ããããæååããå¥åç¦æ¢æåãé¤ããæååã«å¤æããã - * @param input æ¤æ»å¯¾è±¡æåå - * @return é¤å»æ¸ã¿æåå - */ - private String filter(CharSequence input){ - if(onIMEoperation()) return input.toString(); - - int length = input.length(); - CharBuffer buf = CharBuffer.allocate(length); - - for(int pos = 0; pos < length; pos++){ - char ch = input.charAt(pos); - if(ch == '\u2211') ch = '\u03a3'; // Î£å¤æ - if(ch == '\u00ac') ch = '\uffe2'; // ï¿¢å¤æ -// if(ch == 0x005c ) ch = '\u00a5'; // ããã¯ã¹ã©ãã·ã¥ããåã¸ - if(isValid(ch)) buf.append(ch); - } - - buf.flip(); - return buf.toString(); - } - - /** - * {@inheritDoc} - * @param fb {@inheritDoc} - * @param offset {@inheritDoc} - * @param text {@inheritDoc} - * @param attrs {@inheritDoc} - * @throws javax.swing.text.BadLocationException {@inheritDoc} - */ - @Override - public void insertString(FilterBypass fb, - int offset, - String text, - AttributeSet attrs) - throws BadLocationException{ - String filtered = filter(text); - - if( ! onIMEoperation() ){ - Document document = fb.getDocument(); - int docLength = document.getLength(); - int rest = MAX_DOCUMENT - docLength; - if(rest < 0){ - return; - }else if(rest < filtered.length()){ - filtered = filtered.substring(0, rest); - } - } - - fb.insertString(offset, filtered, attrs); - - return; - } - - /** - * {@inheritDoc} - * @param fb {@inheritDoc} - * @param offset {@inheritDoc} - * @param length {@inheritDoc} - * @param text {@inheritDoc} - * @param attrs {@inheritDoc} - * @throws javax.swing.text.BadLocationException {@inheritDoc} - */ - @Override - public void replace(FilterBypass fb, - int offset, - int length, - String text, - AttributeSet attrs) - throws BadLocationException{ - String filtered = filter(text); - - if( ! onIMEoperation() ){ - Document document = fb.getDocument(); - int docLength = document.getLength(); - docLength -= length; - int rest = MAX_DOCUMENT - docLength; - if(rest < 0){ - return; - }else if(rest < filtered.length()){ - filtered = filtered.substring(0, rest); - } - } - - fb.replace(offset, length, filtered, attrs); - - return; - } - } - - // TODO ç¦åãã§ãã¯ã20æåãè¶ããé·å¤§ãªãã¬ã¼ã¯ç¦æ¢æååã®åºç¾ã®ç£è¦ã - // TODO é£ç¶ãããã¯ã¤ãã¹ãã¼ã¹ã«å¯¾ããè¦åã - // TODO åé ãããã¯æ«å°¾ã®ãã¯ã¤ãã¹ãã¼ã¹åºç¾ã«å¯¾ããè¦åã - // TODO æ¹è¡è¨å·ã®è¡¨ç¤º - // TODO æ¹çºè¨è¨å·ã®å°å¥ -} diff --git a/src/main/java/jp/sfjp/jindolf/editor/package-info.java b/src/main/java/jp/sfjp/jindolf/editor/package-info.java deleted file mode 100644 index 0ba1728..0000000 --- a/src/main/java/jp/sfjp/jindolf/editor/package-info.java +++ /dev/null @@ -1,14 +0,0 @@ -/* - * ããã±ã¼ã¸æå ± - * - * License : The MIT License - * Copyright(c) 2011 olyutorskii - */ - -/** - * çºè¨ã¨ãã£ã¿é¢é£ã®ä¸é£ã®ã¯ã©ã¹ã - */ - -package jp.sfjp.jindolf.editor; - -/* EOF */ diff --git a/src/main/java/jp/sfjp/jindolf/glyph/AnchorDraw.java b/src/main/java/jp/sfjp/jindolf/glyph/AnchorDraw.java index 309cf46..5740437 100644 --- a/src/main/java/jp/sfjp/jindolf/glyph/AnchorDraw.java +++ b/src/main/java/jp/sfjp/jindolf/glyph/AnchorDraw.java @@ -21,6 +21,7 @@ import jp.sfjp.jindolf.data.DialogPref; import jp.sfjp.jindolf.data.Period; import jp.sfjp.jindolf.data.Talk; import jp.sfjp.jindolf.data.Village; +import jp.sfjp.jindolf.view.AvatarPics; /** * ã¢ã³ã«ã¼æç»ã @@ -90,13 +91,14 @@ public class AnchorDraw extends AbstractTextRow{ private BufferedImage getFaceImage(){ Period period = this.talk.getPeriod(); Village village = period.getVillage(); + AvatarPics avatarPics = village.getAvatarPics(); BufferedImage image; if(this.talk.isGrave()){ - image = village.getGraveImage(); + image = avatarPics.getGraveImage(); }else{ Avatar avatar = this.talk.getAvatar(); - image = village.getAvatarFaceImage(avatar); + image = avatarPics.getAvatarFaceImage(avatar); } return image; diff --git a/src/main/java/jp/sfjp/jindolf/glyph/Discussion.java b/src/main/java/jp/sfjp/jindolf/glyph/Discussion.java index b2bc712..239e3c0 100644 --- a/src/main/java/jp/sfjp/jindolf/glyph/Discussion.java +++ b/src/main/java/jp/sfjp/jindolf/glyph/Discussion.java @@ -23,7 +23,7 @@ import java.awt.event.ComponentListener; import java.awt.event.MouseEvent; import java.awt.font.FontRenderContext; import java.io.IOException; -import java.util.EventListener; +import java.util.Arrays; import java.util.LinkedList; import java.util.List; import java.util.ListIterator; @@ -31,6 +31,7 @@ import java.util.regex.Pattern; import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ActionMap; +import javax.swing.Icon; import javax.swing.InputMap; import javax.swing.JComponent; import javax.swing.JMenuItem; @@ -39,7 +40,6 @@ import javax.swing.JTextField; import javax.swing.KeyStroke; import javax.swing.Scrollable; import javax.swing.SwingConstants; -import javax.swing.event.EventListenerList; import javax.swing.event.MouseInputListener; import javax.swing.text.DefaultEditorKit; import jp.sfjp.jindolf.data.Anchor; @@ -56,14 +56,22 @@ import jp.sfjp.jindolf.view.ActionManager; import jp.sfjp.jindolf.view.TopicFilter; /** - * çºè¨è¡¨ç¤ºç»é¢ã + * ä¼è©±è¡¨ç¤ºç»é¢ã * - *

æå½è²¬åã¯ + *

ä¼è©±è¡¨ç¤º
ãã£ã«ã¿ã«ããè¡¨ç¤ºçµãè¾¼ã¿
æ¤ç´¢çµæãã¤ã©ã¤ã
ããã¹ãã®ãã©ãã°é¸æ
ã¢ã³ã«ã¼é¸æå¦ç
ããã¹ãã®CopyAndPaste
ãããã¢ããã¡ãã¥ã¼

rowList = new LinkedList<>(); private final List talkDrawList = new LinkedList<>(); @@ -91,15 +100,14 @@ public class Discussion extends JComponent private int lastWidth = -1; private final DiscussionPopup popup = new DiscussionPopup(); + private Talk activeTalk; + private Anchor activeAnchor; - private final EventListenerList thisListenerList = - new EventListenerList(); - - private final Action copySelectedAction = - new ProxyAction(ActionManager.CMD_COPY); /** - * çºè¨è¡¨ç¤ºç»é¢ãä½æããã + * ã³ã³ã¹ãã©ã¯ã¿ã + * + *

ä¼è©±è¡¨ç¤ºç»é¢ãä½æããã */ @SuppressWarnings("LeakingThisInConstructor") public Discussion(){ @@ -122,9 +130,8 @@ public class Discussion extends JComponent setComponentPopupMenu(this.popup); - updateInputMap(); - ActionMap actionMap = getActionMap(); - actionMap.put(DefaultEditorKit.copyAction, this.copySelectedAction); + modifyInputMap(); + modifyActionMap(); setColorDesign(); @@ -133,7 +140,8 @@ public class Discussion extends JComponent /** * æç»è¨å®ã®æ´æ°ã - * FontRenderContextãæ´æ°ãããå¾ã¯å¿ãå¼ã³åºãå¿è¦ãããã + * + *

FontRenderContextãæ´æ°ãããå¾ã¯å¿ãå¼ã³åºãå¿è¦ãããã */ private void updateRenderingHints(){ Object textAliaseValue; @@ -177,6 +185,7 @@ public class Discussion extends JComponent /** * ãã©ã³ãæç»è¨å®ãå¤æ´ããã + * * @param newFontInfo ãã©ã³ãè¨å® */ public void setFontInfo(FontInfo newFontInfo){ @@ -198,8 +207,9 @@ public class Discussion extends JComponent } /** - * çºè¨è¡¨ç¤ºè¨å®ãå¤æ´ããã - * @param newPref çºè¨è¡¨ç¤ºè¨å® + * ä¼è©±è¡¨ç¤ºè¨å®ãå¤æ´ããã + * + * @param newPref ä¼è©±è¡¨ç¤ºè¨å® */ public void setDialogPref(DialogPref newPref){ this.dialogPref = newPref; @@ -225,6 +235,7 @@ public class Discussion extends JComponent /** * ç¾å¨ã®Periodãè¿ãã + * * @return ç¾å¨ã®Period */ public Period getPeriod(){ @@ -233,7 +244,9 @@ public class Discussion extends JComponent /** * Periodãæ´æ°ããã - * æ°ããPeriodã®è¡¨ç¤ºåå®¹ã¯ã¾ã åæ ãããªãã + * + *

æ°ããPeriodã®è¡¨ç¤ºåå®¹ã¯ã¾ã åæ ãããªãã + * * @param period æ°ããPeriod */ public final void setPeriod(Period period){ @@ -287,8 +300,9 @@ public class Discussion extends JComponent } /** - * çºè¨ãã£ã«ã¿ãè¨å®ããã - * @param filter çºè¨ãã£ã«ã¿ + * ä¼è©±ãã£ã«ã¿ãè¨å®ããã + * + * @param filter ä¼è©±ãã£ã«ã¿ */ public void setTopicFilter(TopicFilter filter){ this.topicFilter = filter; @@ -297,7 +311,7 @@ public class Discussion extends JComponent } /** - * çºè¨ãã£ã«ã¿ãé©ç¨ããã + * ä¼è©±ãã£ã«ã¿ãé©ç¨ããã */ public void filtering(){ if( this.topicFilter != null @@ -321,6 +335,7 @@ public class Discussion extends JComponent /** * æ¤ç´¢ãã¿ã¼ã³ãåå¾ããã + * * @return æ¤ç´¢ãã¿ã¼ã³ */ public RegexPattern getRegexPattern(){ @@ -329,6 +344,7 @@ public class Discussion extends JComponent /** * ä¸ããããæ£è¦è¡¨ç¾ã«ãããããæååããã¤ã©ã¤ãæç»ããã + * * @param newPattern æ¤ç´¢ãã¿ã¼ã³ * @return ãããä»¶æ° */ @@ -486,6 +502,7 @@ public class Discussion extends JComponent /** * æå®ããé åã«è¥å¹²ã®ä¸ä¸ãã¼ã¸ã³ãä»ãã¦ * ã¹ã¯ãã¼ã«ã¦ã£ã³ãã¦ã«è¡¨ç¤ºãããã + * * @param rectangle æå®é å */ private void scrollRectWithMargin(Rectangle rectangle){ @@ -510,6 +527,7 @@ public class Discussion extends JComponent /** * æå®ããç©å½¢ããã£ã«ã¿ãªã³ã°å¯¾è±¡ãå¤å®ããã + * * @param row ç©å½¢ * @return ãã£ã«ã¿ãªã³ã°å¯¾è±¡ãªãtrue */ @@ -541,7 +559,9 @@ public class Discussion extends JComponent /** * å¹ãè¨å®ããã - * å¨åTextRowããªãµã¤ãºãããã + * + *

å¨åTextRowããªãµã¤ãºãããã + * * @param width ã³ã³ãã¼ãã³ãå¹ */ private void setWidth(int width){ @@ -559,8 +579,10 @@ public class Discussion extends JComponent /** * åTextRowã®ç¸¦ä½ç½®ã¬ã¤ã¢ã¦ããè¡ãã - * ãã£ã«ã¿ãªã³ã°ãåæ ãããã - * TextRowã¯å¿è¦ã«å¿ãã¦ç§»åãããããããªãµã¤ãºããããã¨ã¯ãªãã + * + *

ãã£ã«ã¿ãªã³ã°ãåæ ãããã + * + *

TextRowã¯å¿è¦ã«å¿ãã¦ç§»åãããããããªãµã¤ãºããããã¨ã¯ãªãã */ private void layoutVertical(){ Rectangle unionRect = null; @@ -613,6 +635,9 @@ public class Discussion extends JComponent /** * {@inheritDoc} + * + *

æç»å¦ç + * * @param g {@inheritDoc} */ @Override @@ -637,6 +662,7 @@ public class Discussion extends JComponent /** * {@inheritDoc} + * * @return {@inheritDoc} */ @Override @@ -646,6 +672,7 @@ public class Discussion extends JComponent /** * {@inheritDoc} + * * @return {@inheritDoc} */ @Override @@ -655,6 +682,7 @@ public class Discussion extends JComponent /** * {@inheritDoc} + * * @return {@inheritDoc} */ @Override @@ -664,6 +692,7 @@ public class Discussion extends JComponent /** * {@inheritDoc} + * * @param visibleRect {@inheritDoc} * @param orientation {@inheritDoc} * @param direction {@inheritDoc} @@ -681,6 +710,7 @@ public class Discussion extends JComponent /** * {@inheritDoc} + * * @param visibleRect {@inheritDoc} * @param orientation {@inheritDoc} * @param direction {@inheritDoc} @@ -694,9 +724,11 @@ public class Discussion extends JComponent } /** - * ä»»æã®çºè¨ã®è¡¨ç¤ºãå ããç»é¢é åãè¿ãã - * çºè¨ããã£ã«ã¿ãªã³ã°å¯¾è±¡ã®æã¯nullãè¿ãã - * @param talk çºè¨ + * ä»»æã®ä¼è©±ã®è¡¨ç¤ºãå ããç»é¢é åãè¿ãã + * + *

ä¼è©±ããã£ã«ã¿ãªã³ã°å¯¾è±¡ã®æã¯nullãè¿ãã + * + * @param talk ä¼è©± * @return é å */ public Rectangle getTalkBounds(Talk talk){ @@ -715,6 +747,7 @@ public class Discussion extends JComponent /** * ãã©ãã°å¦çãè¡ãã + * * @param from ãã©ãã°éå§ä½ç½® * @param to ç¾å¨ã®ãã©ãã°ä½ç½® */ @@ -743,9 +776,10 @@ public class Discussion extends JComponent } /** - * ä¸ããããç¹åº§æ¨ãåå«ããçºè¨ãè¿ãã + * ä¸ããããç¹åº§æ¨ãåå«ããä¼è©±ãè¿ãã + * * @param pt ç¹åº§æ¨ï¼JComponentåºæºï¼ - * @return ç¹åº§æ¨ãå«ãçºè¨ãå«ãçºè¨ããªããã°nullãè¿ãã + * @return ç¹åº§æ¨ãå«ãä¼è©±ãå«ãä¼è©±ããªããã°nullãè¿ãã */ // TODO äºåæ¢ç´¢ã¨ããããã private TalkDraw getHittedTalkDraw(Point pt){ @@ -759,6 +793,7 @@ public class Discussion extends JComponent /** * ã¢ã³ã«ã¼ã¯ãªãã¯åä½ã®å¦çã + * * @param pt ã¯ãªãã¯ãã¤ã³ã */ private void hitAnchor(Point pt){ @@ -779,6 +814,7 @@ public class Discussion extends JComponent /** * æ¤ç´¢ãããæååã¯ãªãã¯åä½ã®å¦çã + * * @param pt ã¯ãªãã¯ãã¤ã³ã */ private void hitRegex(Point pt){ @@ -796,8 +832,11 @@ public class Discussion extends JComponent /** * {@inheritDoc} - * ã¢ã³ã«ã¼ãããå¦çãè¡ãã - * MouseInputListenerãåç§ããã + * + *

ã¢ã³ã«ã¼ãããå¦çãè¡ãã + * + *

MouseInputListenerãåç§ããã + * * @param event {@inheritDoc} */ // TODO è·é¢å¤å®ãã·ãã¢ãã @@ -814,6 +853,7 @@ public class Discussion extends JComponent /** * {@inheritDoc} + * * @param event {@inheritDoc} */ @Override @@ -824,6 +864,7 @@ public class Discussion extends JComponent /** * {@inheritDoc} + * * @param event {@inheritDoc} */ @Override @@ -833,7 +874,9 @@ public class Discussion extends JComponent /** * {@inheritDoc} - * ãã©ãã°éå§å¦çãè¡ãã + * + *

ãã©ãã°éå§å¦çãè¡ãã + * * @param event {@inheritDoc} */ @Override @@ -850,7 +893,9 @@ public class Discussion extends JComponent /** * {@inheritDoc} - * ãã©ãã°çµäºå¦çãè¡ãã + * + *

ãã©ãã°çµäºå¦çãè¡ãã + * * @param event {@inheritDoc} */ @Override @@ -863,7 +908,9 @@ public class Discussion extends JComponent /** * {@inheritDoc} - * ãã©ãã°å¦çãè¡ãã + * + *

ãã©ãã°å¦çãè¡ãã + * * @param event {@inheritDoc} */ // TODO ãã©ãã°ç¯å²ããã¥ã¼ãã¼ããè¶ãããèªåçã«ã¹ã¯ãã¼ã«ãã¦ã»ããã @@ -877,6 +924,7 @@ public class Discussion extends JComponent /** * {@inheritDoc} + * * @param event {@inheritDoc} */ @Override @@ -886,6 +934,7 @@ public class Discussion extends JComponent /** * {@inheritDoc} + * * @param event {@inheritDoc} */ @Override @@ -895,6 +944,7 @@ public class Discussion extends JComponent /** * {@inheritDoc} + * * @param event {@inheritDoc} */ @Override @@ -904,6 +954,7 @@ public class Discussion extends JComponent /** * {@inheritDoc} + * * @param event {@inheritDoc} */ @Override @@ -913,6 +964,7 @@ public class Discussion extends JComponent /** * {@inheritDoc} + * * @param event {@inheritDoc} */ @Override @@ -931,6 +983,7 @@ public class Discussion extends JComponent /** * é¸ææååãè¿ãã + * * @return é¸ææåå */ public CharSequence getSelected(){ @@ -953,7 +1006,8 @@ public class Discussion extends JComponent /** * é¸ææååãã¯ãªãããã¼ãã«ã³ãã¼ããã - * @return é¸ææåå + * + * @return é¸ææååããªããã°null */ public CharSequence copySelected(){ CharSequence selected = getSelected(); @@ -963,13 +1017,13 @@ public class Discussion extends JComponent } /** - * ç©å½¢ã®ç¤ºãä¸çºè¨ãã¯ãªãããã¼ãã«ã³ãã¼ããã + * ä¸ä¼è©±å¨ä½ã®æåååå®¹ãã¯ãªãããã¼ãã«ã³ãã¼ããã + * * @return ã³ãã¼ããæåå */ public CharSequence copyTalk(){ - TalkDraw talkDraw = this.popup.lastPopupedTalkDraw; - if(talkDraw == null) return null; - Talk talk = talkDraw.getTalk(); + Talk talk = getActiveTalk(); + if(talk == null) return null; StringBuilder selected = new StringBuilder(); @@ -994,189 +1048,224 @@ public class Discussion extends JComponent } /** - * ãããã¢ããã¡ãã¥ã¼ããªã¬åº§æ¨ã«çºè¨ãããã°ãããè¿ãã - * @return çºè¨ + * ãããã¢ããã¡ãã¥ã¼ããªã¬ãªã©ã®è¦å ã«ãã + * ç¹å®ã®ä¼è©±ã¸ã®æç¤ºãããã°ãããè¿ãã + * + * @return ä¼è©± + */ + public Talk getActiveTalk(){ + return this.activeTalk; + } + + /** + * ãããã¢ããã¡ãã¥ã¼ããªã¬ãªã©ã®è¦å ã«ãã + * ç¹å®ã®ä¼è©±ã¸ã®æç¤ºãããã°ãããè¨å®ããã + * + * @param talk ä¼è©± */ - public Talk getPopupedTalk(){ - TalkDraw talkDraw = this.popup.lastPopupedTalkDraw; - if(talkDraw == null) return null; - Talk talk = talkDraw.getTalk(); - return talk; + public void setActiveTalk(Talk talk){ + this.activeTalk = talk; + return; } /** - * ãããã¢ããã¡ãã¥ã¼ããªã¬åº§æ¨ã«ã¢ã³ã«ã¼ãããã°ãããè¿ãã + * ãããã¢ããã¡ãã¥ã¼ããªã¬ãªã©ã®è¦å ã«ãã + * ç¹å®ã®ã¢ã³ã«ã¼ã¸ã®æç¤ºãããã°ãããè¿ãã + * * @return ã¢ã³ã«ã¼ */ - public Anchor getPopupedAnchor(){ - return this.popup.lastPopupedAnchor; + public Anchor getActiveAnchor(){ + return this.activeAnchor; + } + + /** + * ãããã¢ããã¡ãã¥ã¼ããªã¬ãªã©ã®è¦å ã«ãã + * ç¹å®ã®ã¢ã³ã«ã¼ã¸ã®æç¤ºãããã°ãããè¨å®ããã + * + * @param anchor ã¢ã³ã«ã¼ + */ + public void setActiveAnchor(Anchor anchor){ + this.activeAnchor = anchor; + return; } /** * {@inheritDoc} + * + *

ãã¼ãã¤ã³ãã£ã³ã°è¨å®ãå¤ããå¯è½æ§ããã */ @Override public void updateUI(){ super.updateUI(); - this.popup.updateUI(); - - updateInputMap(); - + modifyInputMap(); return; } /** * COPYå¦çãè¡ããã¼ã®è¨å®ãJTextFieldããæµç¨ããã - * ããããã¯Ctrl-CãMacãªãCommand-Cããã + * + *

ããããã¯Ctrl-CãMacãªãCommand-Cããã + * + *

ãã¼è¨å®ã¯LookAndFeelã«ããç°ãªãå¯è½æ§ãããã */ - private void updateInputMap(){ + private void modifyInputMap(){ InputMap thisInputMap = getInputMap(); + JComponent sampleComp = new JTextField(); InputMap sampleInputMap; - sampleInputMap = new JTextField().getInputMap(); + sampleInputMap = sampleComp.getInputMap(); + KeyStroke[] strokes = sampleInputMap.allKeys(); - for(KeyStroke stroke : strokes){ - Object bind = sampleInputMap.get(stroke); - if(bind.equals(DefaultEditorKit.copyAction)){ - thisInputMap.put(stroke, DefaultEditorKit.copyAction); - } - } + Arrays.stream(strokes).filter((stroke) -> { + Object binding = sampleInputMap.get(stroke); + return DefaultEditorKit.copyAction.equals(binding); + }).forEach((stroke) -> + thisInputMap.put(stroke, DefaultEditorKit.copyAction) + ); + + return; + } + /** + * COPYå¦çãè¡ãActionãå²ãå½ã¦ãã + */ + private void modifyActionMap(){ + ActionMap actionMap = getActionMap(); + Action copyAction = new CopySelAction(); + actionMap.put(DefaultEditorKit.copyAction, copyAction); return; } /** * ActionListenerãè¿½å ããã + * + *

éç¥å¯¾è±¡ã¨ãªãActionã¯ã + * COPYãã¼æä½ã«ãã£ã¦é¸ææååããã¯ãªãããã¼ãã¸ã® + * ã³ãã¼ãæç¤ºãããå ´åã¨ãããã¢ããã¡ãã¥ã¼ã®æ¼ä¸ã + * * @param listener ãªã¹ãã¼ */ public void addActionListener(ActionListener listener){ - this.thisListenerList.add(ActionListener.class, listener); - - this.popup.menuCopy .addActionListener(listener); - this.popup.menuSelTalk .addActionListener(listener); - this.popup.menuJumpAnchor .addActionListener(listener); - this.popup.menuWebTalk .addActionListener(listener); - this.popup.menuSummary .addActionListener(listener); - + this.listenerList.add(ActionListener.class, listener); + this.popup.addActionListener(listener); return; } /** * ActionListenerãåé¤ããã + * * @param listener ãªã¹ãã¼ */ public void removeActionListener(ActionListener listener){ - this.thisListenerList.remove(ActionListener.class, listener); - - this.popup.menuCopy .removeActionListener(listener); - this.popup.menuSelTalk .removeActionListener(listener); - this.popup.menuJumpAnchor .removeActionListener(listener); - this.popup.menuWebTalk .removeActionListener(listener); - this.popup.menuSummary .removeActionListener(listener); - + this.listenerList.remove(ActionListener.class, listener); + this.popup.removeActionListener(listener); return; } /** * ActionListenerãåæããã + * * @return ãã¹ã¦ã®ActionListener */ public ActionListener[] getActionListeners(){ - return this.thisListenerList.getListeners(ActionListener.class); + return this.listenerList.getListeners(ActionListener.class); + } + + /** + * ç»é²æ¸ã¿ãªã¹ãã«å¯¾ãActionEventãçºç«ããã + * + *

å¯¾è±¡ã¨ãªãActionã¯ã + * COPYãã¼æä½ã«ãã£ã¦é¸ææååããã¯ãªãããã¼ãã¸ã® + * ã³ãã¼ãæç¤ºãããå ´åã®ã¿ã + * + * @param event ã¤ãã³ã + */ + protected void fireActionPerformed(ActionEvent event) { + Object source = event.getSource(); + int id = event.getID(); + String actcmd = event.getActionCommand(); + long when = event.getWhen(); + int modifiers = event.getModifiers(); + + ActionEvent newEvent = + new ActionEvent(source, id, actcmd, when, modifiers); + + for(ActionListener listener : getActionListeners()){ + listener.actionPerformed(newEvent); + } + + return; } /** * AnchorHitListenerãè¿½å ããã + * * @param listener ãªã¹ãã¼ */ public void addAnchorHitListener(AnchorHitListener listener){ - this.thisListenerList.add(AnchorHitListener.class, listener); + this.listenerList.add(AnchorHitListener.class, listener); return; } /** * AnchorHitListenerãåé¤ããã + * * @param listener ãªã¹ãã¼ */ public void removeAnchorHitListener(AnchorHitListener listener){ - this.thisListenerList.remove(AnchorHitListener.class, listener); + this.listenerList.remove(AnchorHitListener.class, listener); return; } /** * AnchorHitListenerãåæããã + * * @return ãã¹ã¦ã®AnchorHitListener */ public AnchorHitListener[] getAnchorHitListeners(){ - return this.thisListenerList.getListeners(AnchorHitListener.class); + return this.listenerList.getListeners(AnchorHitListener.class); } - /** - * {@inheritDoc} - * @param {@inheritDoc} - * @param listenerType {@inheritDoc} - * @return {@inheritDoc} - */ - @Override - public T[] getListeners(Class listenerType){ - T[] result; - result = this.thisListenerList.getListeners(listenerType); - - if(result.length <= 0){ - result = super.getListeners(listenerType); - } - - return result; - } /** - * ãã¼ãã¼ãå¥åç¨ããã¼Actionã + * COPYãã¼ãã¼ãæä½åä¿¡ç¨ããã¼Actionã + * + *

COPYãã¼æ¼ä¸ã¤ãã³ãã¯COPYã³ãã³ãå®è¡ã¤ãã³ãã«å¤æããã + * {@link Discussion}ã®ãªã¹ãã¸éç¥ãããã */ - private class ProxyAction extends AbstractAction{ - - private final String command; + private class CopySelAction extends AbstractAction{ /** * ã³ã³ã¹ãã©ã¯ã¿ã - * @param command ã³ãã³ã - * @throws NullPointerException å¼æ°ãnull */ - public ProxyAction(String command) throws NullPointerException{ + CopySelAction() throws NullPointerException{ super(); - if(command == null) throw new NullPointerException(); - this.command = command; return; } /** * {@inheritDoc} - * @param event {@inheritDoc} + * + * @param event COPYãã¼ãã¼ãæ¼ä¸ã¤ãã³ã */ @Override public void actionPerformed(ActionEvent event){ - Object source = event.getSource(); - int id = event.getID(); - String actcmd = this.command; - long when = event.getWhen(); - int modifiers = event.getModifiers(); - - for(ActionListener listener : getActionListeners()){ - ActionEvent newEvent = new ActionEvent(source, - id, - actcmd, - when, - modifiers ); - listener.actionPerformed(newEvent); - } - + ActionEvent newEvent = + new ActionEvent( + this, + ActionEvent.ACTION_PERFORMED, + ActionManager.CMD_COPY + ); + fireActionPerformed(newEvent); return; } + } /** * ãããã¢ããã¡ãã¥ã¼ã */ - private class DiscussionPopup extends JPopupMenu{ + private static final class DiscussionPopup extends JPopupMenu{ private final JMenuItem menuCopy = new JMenuItem("é¸æç¯å²ãã³ãã¼"); @@ -1189,15 +1278,26 @@ public class Discussion extends JComponent private final JMenuItem menuSummary = new JMenuItem("çºè¨ãéè¨..."); - private TalkDraw lastPopupedTalkDraw; - private Anchor lastPopupedAnchor; /** * ã³ã³ã¹ãã©ã¯ã¿ã */ - public DiscussionPopup(){ + DiscussionPopup(){ super(); + design(); + setCommand(); + + Icon icon = GUIUtils.getWWWIcon(); + this.menuWebTalk.setIcon(icon); + + return; + } + + /** + * ã¡ãã¥ã¼ã®ãã¶ã¤ã³ã + */ + private void design(){ add(this.menuCopy); add(this.menuSelTalk); addSeparator(); @@ -1205,67 +1305,119 @@ public class Discussion extends JComponent add(this.menuWebTalk); addSeparator(); add(this.menuSummary); + return; + } + /** + * ã¢ã¯ã·ã§ã³ã³ãã³ãã®è¨å®ã + */ + private void setCommand(){ this.menuCopy - .setActionCommand(ActionManager.CMD_COPY); + .setActionCommand(ActionManager.CMD_COPY); this.menuSelTalk - .setActionCommand(ActionManager.CMD_COPYTALK); + .setActionCommand(ActionManager.CMD_COPYTALK); this.menuJumpAnchor - .setActionCommand(ActionManager.CMD_JUMPANCHOR); + .setActionCommand(ActionManager.CMD_JUMPANCHOR); this.menuWebTalk - .setActionCommand(ActionManager.CMD_WEBTALK); + .setActionCommand(ActionManager.CMD_WEBTALK); this.menuSummary - .setActionCommand(ActionManager.CMD_DAYSUMMARY); - - this.menuWebTalk.setIcon(GUIUtils.getWWWIcon()); - + .setActionCommand(ActionManager.CMD_DAYSUMMARY); return; } /** * {@inheritDoc} - * @param comp {@inheritDoc} + * + *

ç¶æ³ã«å¿ãã¦ãã¿ã³ç¾¤ããã¹ã¯ããã + * + *

ãããã¢ããã¯ãªãã¯ã®å¯¾è±¡ã¨ãªã£ãä¼è©±ãã¢ã³ã«ã¼ãè¨é²ããã + * + * @param invoker {@inheritDoc} * @param x {@inheritDoc} * @param y {@inheritDoc} */ @Override - public void show(Component comp, int x, int y){ + public void show(Component invoker, int x, int y){ + if( ! (invoker instanceof Discussion) ){ + super.show(invoker, x, y); + return; + } + Discussion dis = (Discussion) invoker; + Point point = new Point(x, y); - this.lastPopupedTalkDraw = getHittedTalkDraw(point); - if(this.lastPopupedTalkDraw != null){ - this.menuSelTalk.setEnabled(true); - this.menuWebTalk.setEnabled(true); - }else{ - this.menuSelTalk.setEnabled(false); - this.menuWebTalk.setEnabled(false); - } + boolean talkPointed = false; + Talk activeTalk = null; + Anchor activeAnchor = null; - if(this.lastPopupedTalkDraw != null){ - this.lastPopupedAnchor = - this.lastPopupedTalkDraw.getAnchor(point); - }else{ - this.lastPopupedAnchor = null; + TalkDraw popupTalkDraw = dis.getHittedTalkDraw(point); + if(popupTalkDraw != null){ + talkPointed = true; + activeTalk = popupTalkDraw.getTalk(); + activeAnchor = popupTalkDraw.getAnchor(point); } - if(this.lastPopupedAnchor != null){ - this.menuJumpAnchor.setEnabled(true); - }else{ - this.menuJumpAnchor.setEnabled(false); - } + dis.setActiveTalk(activeTalk); + dis.setActiveAnchor(activeAnchor); - if(getSelected() != null){ - this.menuCopy.setEnabled(true); - }else{ - this.menuCopy.setEnabled(false); - } + boolean anchorPointed = activeAnchor != null; + boolean hasSelectedText = dis.getSelected() != null; + + this.menuSelTalk .setEnabled(talkPointed); + this.menuWebTalk .setEnabled(talkPointed); + this.menuJumpAnchor .setEnabled(anchorPointed); + this.menuCopy .setEnabled(hasSelectedText); + + super.show(invoker, x, y); + + return; + } + + /** + * ActionListenerãè¿½å ããã + * + *

åä¿¡å¯¾è±¡ã¯ãããã¢ããã¡ãã¥ã¼æ¼ä¸ã + * + * @param listener ãªã¹ãã¼ + */ + public void addActionListener(ActionListener listener){ + this.listenerList.add(ActionListener.class, listener); - super.show(comp, x, y); + this.menuCopy .addActionListener(listener); + this.menuSelTalk .addActionListener(listener); + this.menuJumpAnchor .addActionListener(listener); + this.menuWebTalk .addActionListener(listener); + this.menuSummary .addActionListener(listener); return; } + + /** + * ActionListenerãåé¤ããã + * + * @param listener ãªã¹ãã¼ + */ + public void removeActionListener(ActionListener listener){ + this.listenerList.remove(ActionListener.class, listener); + + this.menuCopy .removeActionListener(listener); + this.menuSelTalk .removeActionListener(listener); + this.menuJumpAnchor .removeActionListener(listener); + this.menuWebTalk .removeActionListener(listener); + this.menuSummary .removeActionListener(listener); + + return; + } + + /** + * ActionListenerãåæããã + * + * @return ãã¹ã¦ã®ActionListener + */ + public ActionListener[] getActionListeners(){ + return this.listenerList.getListeners(ActionListener.class); + } + } - // TODO ã·ã³ãã«ã¢ã¼ãã®è¿½å - // Periodå¤æ´ãè¿½è·¡ãããªã¹ãå } diff --git a/src/main/java/jp/sfjp/jindolf/glyph/TalkDraw.java b/src/main/java/jp/sfjp/jindolf/glyph/TalkDraw.java index d6cbf2d..34d19cf 100644 --- a/src/main/java/jp/sfjp/jindolf/glyph/TalkDraw.java +++ b/src/main/java/jp/sfjp/jindolf/glyph/TalkDraw.java @@ -27,6 +27,7 @@ import jp.sfjp.jindolf.data.Period; import jp.sfjp.jindolf.data.Talk; import jp.sfjp.jindolf.data.Village; import jp.sfjp.jindolf.util.GUIUtils; +import jp.sfjp.jindolf.view.AvatarPics; import jp.sourceforge.jindolf.corelib.TalkType; /** @@ -269,6 +270,7 @@ public class TalkDraw extends AbstractTextRow{ */ private BufferedImage getFaceImage(){ Village village = this.talk.getPeriod().getVillage(); + AvatarPics avatarPics = village.getAvatarPics(); Avatar avatar = this.talk.getAvatar(); boolean useBodyImage = this.dialogPref.useBodyImage(); @@ -278,22 +280,22 @@ public class TalkDraw extends AbstractTextRow{ if(this.talk.isGrave()){ if(useMonoImage){ if(useBodyImage){ - image = village.getAvatarBodyMonoImage(avatar); + image = avatarPics.getAvatarBodyMonoImage(avatar); }else{ - image = village.getAvatarFaceMonoImage(avatar); + image = avatarPics.getAvatarFaceMonoImage(avatar); } }else{ if(useBodyImage){ - image = village.getGraveBodyImage(); + image = avatarPics.getGraveBodyImage(); }else{ - image = village.getGraveImage(); + image = avatarPics.getGraveImage(); } } }else{ if(useBodyImage){ - image = village.getAvatarBodyImage(avatar); + image = avatarPics.getAvatarBodyImage(avatar); }else{ - image = village.getAvatarFaceImage(avatar); + image = avatarPics.getAvatarFaceImage(avatar); } } @@ -693,11 +695,12 @@ public class TalkDraw extends AbstractTextRow{ int total = 0; total += this.dialog.setRegex(searchRegex); -/* + /* for(AnchorDraw anchorDraw : this.anchorTalks){ total += anchorDraw.setRegex(searchRegex); } -*/ // TODO ããããããã®ã§ä¿ç + */ + // TODO ããããããã®ã§ä¿ç return total; } diff --git a/src/main/java/jp/sfjp/jindolf/net/AuthManager.java b/src/main/java/jp/sfjp/jindolf/net/AuthManager.java deleted file mode 100644 index cc0d4c1..0000000 --- a/src/main/java/jp/sfjp/jindolf/net/AuthManager.java +++ /dev/null @@ -1,240 +0,0 @@ -/* - * manage authentification info - * - * License : The MIT License - * Copyright(c) 2012 olyutorskii - */ - -package jp.sfjp.jindolf.net; - -import java.io.UnsupportedEncodingException; -import java.net.CookieHandler; -import java.net.CookieManager; -import java.net.CookieStore; -import java.net.HttpCookie; -import java.net.URI; -import java.net.URISyntaxException; -import java.net.URL; -import java.net.URLEncoder; -import java.util.List; - -/** - * Cookieãç¨ããäººç¼BBSãµã¼ãã¨ã®èªè¨¼ç®¡çãè¡ãã - * - *

2012-10ç¾å¨ããµãã¼ãããã®ã¯Gå½ã®ã¿ã - * - *

2012-10ãããCookie "uniqID" ã®éåºãå¿è¦ã«ãªã£ãæ¨¡æ§ã - */ -public class AuthManager{ - - /** ãã°ã¢ã¦ãç¨ã®POSTãã¼ã¿ã */ - public static final String POST_LOGOUT; - - private static final String COOKIE_LOGIN = "login"; - private static final String ENC_POST = "UTF-8"; - private static final String PARAM_REDIR; - - private static final CookieManager COOKIE_MANAGER; - - static{ - PARAM_REDIR = "cgi_param=" + encodeForm4Post("&#bottom"); - POST_LOGOUT = "cmd=logout" + '&' + PARAM_REDIR; - - COOKIE_MANAGER = new CookieManager(); - CookieHandler.setDefault(COOKIE_MANAGER); - } - - - private final URI baseURI; - - - /** - * ã³ã³ã¹ãã©ã¯ã¿ã - * @param bbsUri äººç¼BBSãµã¼ãURI - * @throws NullPointerException å¼æ°ãnull - */ - public AuthManager(URI bbsUri) throws NullPointerException{ - if(bbsUri == null) throw new NullPointerException(); - this.baseURI = bbsUri; - return; - } - - /** - * ã³ã³ã¹ãã©ã¯ã¿ã - * @param bbsUrl äººç¼BBSãµã¼ãURL - * @throws NullPointerException å¼æ°ãnull - * @throws IllegalArgumentException ä¸æ£ãªæ¸å¼ - */ - public AuthManager(URL bbsUrl) - throws NullPointerException, IllegalArgumentException{ - this(urlToUri(bbsUrl)); - return; - } - - - /** - * URLããURIã¸å¤æããã - * æ¸å¼ã«é¢ããä¾å¤ã¯éãã§ãã¯ä¾å¤ã¸å¤æãããã - * @param url URL - * @return URI - * @throws NullPointerException å¼æ°ãnull - * @throws IllegalArgumentException ä¸æ£ãªæ¸å¼ - */ - private static URI urlToUri(URL url) - throws NullPointerException, IllegalArgumentException{ - if(url == null) throw new NullPointerException(); - - URI uri; - try{ - uri = url.toURI(); - }catch(URISyntaxException e){ - throw new IllegalArgumentException(e); - } - - return uri; - } - - /** - * ä¸ããããæååã«å¯¾ã - * ãapplication/x-www-form-urlencodedãç¬¦å·åãè¡ãã - * - *

ãã®ç¬¦å·åã¯HTTPã®POSTã¡ã½ããã§å¿è¦ã«ãªãã - * ãã®å¦çã¯ãä¸è¬çãªPCç¨Webãã©ã¦ã¶ã«ãããã - * HTMLææ¸ã®FORMã¿ã°ã«ä¼´ãsubmitå¦çãæ¨¡å£ããã - * - *

çææååã¯US-ASCIIã®ç¯çã«åã¾ããã¯ãã - * - * @param formData åã®æåå - * @return ç¬¦å·åãããæåå - * @see java.net.URLEncoder - * @see - * - * RFC1866 8.2.1 - * - */ - public static String encodeForm4Post(String formData){ - if(formData == null){ - return null; - } - - String result; - try{ - result = URLEncoder.encode(formData, ENC_POST); - }catch(UnsupportedEncodingException e){ - assert false; - result = null; - } - - return result; - } - - /** - * éåç{@link #encodeForm4Post(java.lang.String)}ã - * @param formData åã®æåå - * @return ç¬¦å·åãããæåå - * @see #encodeForm4Post(java.lang.String) - */ - public static String encodeForm4Post(char[] formData){ - return encodeForm4Post(new String(formData)); - } - - /** - * ãã°ã¤ã³ç¨POSTãã¼ã¿ãçæããã - * @param userID äººç¼BBSã¢ã«ã¦ã³ãå - * @param password ãã¹ã¯ã¼ã - * @return POSTãã¼ã¿ - */ - public static String buildLoginPostData(String userID, char[] password){ - String id = encodeForm4Post(userID); - if(id == null || id.isEmpty()){ - return null; - } - - String pw = encodeForm4Post(password); - if(pw == null || pw.isEmpty()){ - return null; - } - - StringBuilder postData = new StringBuilder(); - postData.append("cmd=login"); - postData.append('&').append(PARAM_REDIR); - postData.append('&').append("user_id=").append(id); - postData.append('&').append("password=").append(pw); - - String result = postData.toString(); - return result; - } - - - /** - * äººç¼BBSãµã¼ãã®ãã¼ã¹URIãè¿ãã - * @return ãã¼ã¹URI - */ - public URI getBaseURI(){ - return this.baseURI; - } - - /** - * äººç¼BBSãµã¼ãç®¡è½ä¸ã®å¨Cookieãåæããã - * ä»ãµã¼ãç±æ¥ã®Cookieç¾¤ã¨ã®åºå¥ã¯Cookieãã¡ã¤ã³åã§å¤æãããã - * @param cookieStore Cookieè¨æ¶å - * @return äººç¼BBSãµã¼ãç®¡è½ä¸ã®Cookieã®ãªã¹ã - */ - public List getCookieList(CookieStore cookieStore){ - List cookieList = cookieStore.get(this.baseURI); - return cookieList; - } - - /** - * èªè¨¼Cookieãåå¾ããã - * - *

Gå½ã§ã®èªè¨¼Cookieåã¯"login"ã - * - *

â» 2012-10ãã"uniqID"ãå¢ããæ¨¡æ§ã ãå¤å®ã«ã¯ä½¿ããªãã - * - * @param cookieStore Cookieè¨æ¶å - * @return èªè¨¼Cookieãèªè¨¼ãããç¶æã«ç¡ãã¨ãã¯nullã - */ - public HttpCookie getAuthCookie(CookieStore cookieStore){ - List cookieList = getCookieList(cookieStore); - for(HttpCookie cookie : cookieList){ - String cookieName = cookie.getName(); - if(COOKIE_LOGIN.equals(cookieName)) return cookie; - } - - return null; - } - - /** - * ç¾å¨ãã°ã¤ã³ä¸ãå¦ãå¤å¥ããã - * @return ãã°ã¤ã³ä¸ãªãtrue - */ - public boolean hasLoggedIn(){ - assert COOKIE_MANAGER == CookieHandler.getDefault(); - CookieStore cookieStore = COOKIE_MANAGER.getCookieStore(); - - HttpCookie authCookie = getAuthCookie(cookieStore); - if(authCookie == null){ - clearAuthentication(); - return false; - } - - return true; - } - - /** - * èªè¨¼æå ±ãã¯ãªã¢ããã - */ - public void clearAuthentication(){ - assert COOKIE_MANAGER == CookieHandler.getDefault(); - CookieStore cookieStore = COOKIE_MANAGER.getCookieStore(); - - HttpCookie authCookie = getAuthCookie(cookieStore); - if(authCookie != null){ - cookieStore.remove(this.baseURI, authCookie); - } - - return; - } - -} diff --git a/src/main/java/jp/sfjp/jindolf/net/HttpUtils.java b/src/main/java/jp/sfjp/jindolf/net/HttpUtils.java index 90ebdad..e3a5c11 100644 --- a/src/main/java/jp/sfjp/jindolf/net/HttpUtils.java +++ b/src/main/java/jp/sfjp/jindolf/net/HttpUtils.java @@ -11,6 +11,7 @@ import java.io.IOException; import java.net.HttpURLConnection; import java.net.URLConnection; import java.text.MessageFormat; +import java.util.Arrays; import java.util.regex.Matcher; import java.util.regex.Pattern; import jp.sfjp.jindolf.VerInfo; @@ -52,6 +53,7 @@ public final class HttpUtils{ /** * ãããã¯ã¼ã¯ã®ã¹ã«ã¼ãããå ±åç¨æååãçæããã + * * @param size è»¢éãµã¤ãº(ãã¤ãæ°) * @param nano æè¦æé(ããç§) * @return ã¹ã«ã¼ãããæååãå¼æ°ã®ããããã0ä»¥ä¸ãªãç©ºæåå @@ -80,6 +82,7 @@ public final class HttpUtils{ /** * HTTPã»ãã·ã§ã³ã®åç¨®çµæãæåååããã + * * @param conn HTTPã³ãã¯ã·ã§ã³ * @param size è»¢éãµã¤ãº * @param nano è»¢éã«è¦ããããç§ @@ -117,55 +120,49 @@ public final class HttpUtils{ } /** - * ã¦ã¼ã¶ã¨ã¼ã¸ã§ã³ãåãè¿ãã - * @return ã¦ã¼ã¶ã¨ã¼ã¸ã§ã³ãå + * HTTP UserAgentåãè¿ãã + * + * @return UserAgentå + * @see + * User-Agent */ public static String getUserAgentName(){ StringBuilder result = new StringBuilder(); - result.append(VerInfo.TITLE).append("/").append(VerInfo.VERSION); + result.append(VerInfo.TITLE).append('/').append(VerInfo.VERSION); StringBuilder rawComment = new StringBuilder(); - if(EnvInfo.OS_NAME != null){ - if(rawComment.length() > 0) rawComment.append("; "); - rawComment.append(EnvInfo.OS_NAME); - } - if(EnvInfo.OS_VERSION != null){ - if(rawComment.length() > 0) rawComment.append("; "); - rawComment.append(EnvInfo.OS_VERSION); - } - if(EnvInfo.OS_ARCH != null){ - if(rawComment.length() > 0) rawComment.append("; "); - rawComment.append(EnvInfo.OS_ARCH); - } - if(EnvInfo.JAVA_VENDOR != null){ - if(rawComment.length() > 0) rawComment.append("; "); - rawComment.append(EnvInfo.JAVA_VENDOR); - } - if(EnvInfo.JAVA_VERSION != null){ - if(rawComment.length() > 0) rawComment.append("; "); - rawComment.append(EnvInfo.JAVA_VERSION); + Arrays.asList( + EnvInfo.OS_NAME, + EnvInfo.OS_VERSION, + EnvInfo.OS_ARCH, + EnvInfo.JAVA_VENDOR, + EnvInfo.JAVA_VERSION + ).stream().forEachOrdered(info -> { + if(rawComment.length() > 0) rawComment.append(";\u0020"); + rawComment.append(info); + }); + + if(rawComment.length() > 0){ + CharSequence comment = escapeHttpComment(rawComment); + result.append('\u0020').append(comment); } - CharSequence comment = escapeHttpComment(rawComment); - if(comment != null) result.append(" ").append(comment); - return result.toString(); } /** * ä¸ããããæååããHTTPã³ã¡ã³ããçæããã + * * @param comment ã³ã¡ã³ã * @return HTTPã³ã¡ã³ã */ public static String escapeHttpComment(CharSequence comment){ - if(comment == null) return null; - if(comment.length() <= 0) return null; - String result = comment.toString(); + result = result.replaceAll("\$", "\\\\("); result = result.replaceAll("\$", "\\\\)"); result = result.replaceAll("[\\u0000-\\u001f]", "?"); - result = result.replaceAll("[\\u007f-\\uffff]", "?"); + result = result.replaceAll("[\\u007f-\\x{10ffff}]", "?"); result = "(" + result + ")"; return result; @@ -173,6 +170,7 @@ public final class HttpUtils{ /** * HTTPå¿çããCharsetãåå¾ããã + * * @param connection HTTPæ¥ç¶ * @return Charsetæåå */ @@ -184,6 +182,7 @@ public final class HttpUtils{ /** * ContentTypeããCharsetãåå¾ããã + * * @param contentType ContentType * @return Charsetæåå */ diff --git a/src/main/java/jp/sfjp/jindolf/net/ProxyChooser.java b/src/main/java/jp/sfjp/jindolf/net/ProxyChooser.java index 30b80e8..93762f4 100644 --- a/src/main/java/jp/sfjp/jindolf/net/ProxyChooser.java +++ b/src/main/java/jp/sfjp/jindolf/net/ProxyChooser.java @@ -35,6 +35,7 @@ import jp.sfjp.jindolf.util.Monodizer; /** * ããã¯ã·ãµã¼ãé¸æç»é¢ã + * * @see RFC2616 * @see RFC1928 */ @@ -64,6 +65,7 @@ public class ProxyChooser extends JPanel implements ItemListener{ /** * ã³ã³ã¹ãã©ã¯ã¿ã + * * @param proxyInfo ããã¯ã·è¨å® */ public ProxyChooser(ProxyInfo proxyInfo){ @@ -100,6 +102,7 @@ public class ProxyChooser extends JPanel implements ItemListener{ /** * ãã¼ãçªå·é¸æè¢ãçæããã + * * @return ãã¼ãçªå·é¸æè¢ */ private static ComboBoxModel buildPortRecommender(){ @@ -115,6 +118,7 @@ public class ProxyChooser extends JPanel implements ItemListener{ /** * ã¬ã¤ã¢ã¦ããè¡ãã + * * @param content ã³ã³ãã */ private void design(Container content){ @@ -143,6 +147,7 @@ public class ProxyChooser extends JPanel implements ItemListener{ /** * ãµã¼ãæå ±ããã«ãçæããã + * * @return ãµã¼ãæå ±ããã« */ private JComponent buildServerPanel(){ @@ -177,13 +182,6 @@ public class ProxyChooser extends JPanel implements ItemListener{ constraints.anchor = GridBagConstraints.NORTHWEST; panel.add(this.port, constraints); - String warn = - "â» ãã®ããã¯ã·ãµã¼ãã¯æ¬å½ã«ä¿¡é ¼ã§ãã¾ããï¼
" - + "ããªããäººç¼BBSã«ãã°ã¤ã³ãã¦ããéã
" - + "ããªãã®ãã¹ã¯ã¼ãã¯å¹³æç¶æã®ã¾ã¾
" - + "ãã®ããã¯ã·ãµã¼ãä¸ãä½åº¦ãééãã¾ãã"; - panel.add(new JLabel(warn), constraints); - Border border = BorderFactory.createTitledBorder("ããã¯ã·ãµã¼ãæå ±"); panel.setBorder(border); @@ -192,6 +190,7 @@ public class ProxyChooser extends JPanel implements ItemListener{ /** * ããã¯ã·ã®ç¨®å¥ãè¿ãã + * * @return ããã¯ã·ç¨®å¥ */ protected Proxy.Type getType(){ @@ -204,7 +203,9 @@ public class ProxyChooser extends JPanel implements ItemListener{ /** * ãµã¼ãåãè¿ãã - * ããã¯ã·ã®ãã¹ãåã¨ãã¦å¦¥å½ãªãã®ãå¦ãã¯æ¤è¨¼ãããªãã + * + *

ããã¯ã·ã®ãã¹ãåã¨ãã¦å¦¥å½ãªãã®ãå¦ãã¯æ¤è¨¼ãããªãã + * * @return ãµã¼ãå */ protected String getHostName(){ @@ -215,7 +216,9 @@ public class ProxyChooser extends JPanel implements ItemListener{ /** * ãã¼ãçªå·ãè¿ãã - * çªå·ã®ä½ããªãã¦ããªããã°ã¼ããè¿ãã + * + *

çªå·ã®ä½ããªãã¦ããªããã°ã¼ããè¿ãã + * * @return ãã¼ãçªå· */ protected int getPort(){ @@ -238,6 +241,7 @@ public class ProxyChooser extends JPanel implements ItemListener{ /** * ãµã¼ãã¸ã®ã½ã±ããã¢ãã¬ã¹ãçæããã + * * @return ã½ã±ããã¢ãã¬ã¹ */ protected InetSocketAddress getInetSocketAddress(){ @@ -246,6 +250,7 @@ public class ProxyChooser extends JPanel implements ItemListener{ /** * ããã¯ã·è¨å®ãè¿ãã + * * @return ããã¯ã·è¨å® */ public ProxyInfo getProxyInfo(){ @@ -255,7 +260,9 @@ public class ProxyChooser extends JPanel implements ItemListener{ /** * ããã¯ã·è¨å®ãè¨å®ããã - * UIã«åæ ãããã + * + *

UIã«åæ ãããã + * * @param proxyInfo ããã¯ã·è¨å®ãnullãªãç´æ¥æ¥ç¶ã¨è§£éãããã */ public final void setProxyInfo(ProxyInfo proxyInfo){ @@ -287,6 +294,7 @@ public class ProxyChooser extends JPanel implements ItemListener{ /** * ããã¯ã·ç¨®å¥ãã¿ã³æä½ã®åä¿¡ã + * * @param event ãã¿ã³æä½ã¤ãã³ã */ @Override diff --git a/src/main/java/jp/sfjp/jindolf/net/ServerAccess.java b/src/main/java/jp/sfjp/jindolf/net/ServerAccess.java index a19fff1..7f65db8 100644 --- a/src/main/java/jp/sfjp/jindolf/net/ServerAccess.java +++ b/src/main/java/jp/sfjp/jindolf/net/ServerAccess.java @@ -12,14 +12,12 @@ import io.bitbucket.olyutorskii.jiocema.DecodeNotifier; import java.awt.image.BufferedImage; import java.io.IOException; import java.io.InputStream; -import java.io.OutputStream; import java.lang.ref.SoftReference; import java.net.HttpURLConnection; import java.net.MalformedURLException; import java.net.Proxy; import java.net.URL; import java.nio.charset.Charset; -import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.logging.Logger; @@ -33,29 +31,46 @@ import jp.sfjp.jindolf.data.Village; /** * å½ãã¨ã®äººç¼BBSãµã¼ãã¨ã®éä¿¡ãä¸æã«å¼ãåããã + * + *

åä¿¡å¯¾è±¡ã¯HTMLã¨åç¨®ã¢ã¤ã³ã³JPEGç»åã + * + *

ããã¯ã·ãµã¼ããä»ããHTTPéä¿¡ãç®¡çããã + * + *

å½ãã¨ã«æåã³ã¼ããä¿æããHTMLææ¸ã®ãã³ã¼ãã«ç¨ããããã + * + *

ç»å(40ç¨®å¼·)ã¯ãã£ãã·ã¥ç®¡çãè¡ãããã + * + *

â» 2020-02ç¾å¨ãé²è¡ä¸ã®æã¯åå¨ããªãããã + * Cookieèªè¨¼å¦çã¯åé¤ãããã + * + *

æå¾ã«HTTPåä¿¡ãè¡ãããæå»ãä¿æããã */ public class ServerAccess{ + private static final int BUFLEN_CONTENT = 200 * 1024; + private static final String USER_AGENT = HttpUtils.getUserAgentName(); private static final String JINRO_CGI = "./index.rb"; + private static final Map> IMAGE_CACHE; + private static final Object CACHE_LOCK = new Object(); private static final Logger LOGGER = Logger.getAnonymousLogger(); - private static final String ENC_POST = "UTF-8"; static{ - Map> cache = - new HashMap<>(); - IMAGE_CACHE = Collections.synchronizedMap(cache); + IMAGE_CACHE = new HashMap<>(); } private final URL baseURL; - private final AuthManager authManager; private final Charset charset; + private final boolean isSJIS; + private final boolean isUTF8; + private Proxy proxy = Proxy.NO_PROXY; + private long lastServerMs; private long lastLocalMs; private long lastSystemMs; @@ -63,7 +78,9 @@ public class ServerAccess{ /** * äººç¼BBSãµã¼ãã¨ã®æ¥ç¶ç®¡çãçæããã - * ãã®æç¹ã§ã¯ã¾ã éä¿¡ã¯è¡ãããªãã + * + *

ãã®æç¹ã§ã¯ã¾ã éä¿¡ã¯è¡ãããªãã + * * @param baseURL å½å¥ã®ãã¼ã¹URL * @param charset å½ã®Charset * @throws IllegalArgumentException ä¸æ£ãªURL @@ -73,15 +90,32 @@ public class ServerAccess{ super(); this.baseURL = baseURL; - this.authManager = new AuthManager(this.baseURL); this.charset = charset; + String charsetName = this.charset.name(); + if("Shift_JIS".equalsIgnoreCase(charsetName)){ + this.isSJIS = true; + this.isUTF8 = false; + }else if("UTF-8".equalsIgnoreCase(charsetName)){ + this.isSJIS = false; + this.isUTF8 = true; + }else{ + throw new IllegalArgumentException(charsetName); + } + assert this.isSJIS ^ this.isUTF8; + return; } /** * ç»åãã£ãã·ã¥ãæ¤ç´¢ããã + * + *

ãã¼ã¯ç»åURLæååã + * + *

ã½ããåç§ãªãã¸ã§ã¯ãã®è§£æ¾ãªã©ã«ããã + * ãã£ãã·ã¥ã®ç¶æ³ã¯å¤åããã + * * @param key ãã¼ * @return ãã£ãã·ã¥ãããç»åããã£ãã·ã¥ããã¦ããªããã°nullã */ @@ -90,31 +124,33 @@ public class ServerAccess{ BufferedImage image; - synchronized(IMAGE_CACHE){ + // atomic get and remove + synchronized(CACHE_LOCK){ SoftReference ref = IMAGE_CACHE.get(key); if(ref == null) return null; - Object referent = ref.get(); - if(referent == null){ + image = ref.get(); + if(image == null){ IMAGE_CACHE.remove(key); - return null; } - - image = (BufferedImage) referent; } return image; } /** - * ç»åãã£ãã·ã¥ã«ç»é²ããã + * ãã£ãã·ã¥ã«ç»åãç»é²ããã + * + *

ãã¼ã¯ç»åURLæååã + * * @param key ãã¼ * @param image ãã£ãã·ã¥ãããç»åã */ private static void putImageCache(String key, BufferedImage image){ if(key == null || image == null) return; - synchronized(IMAGE_CACHE){ + // atomic get and put + synchronized(CACHE_LOCK){ if(getImageCache(key) != null) return; SoftReference ref = new SoftReference<>(image); @@ -124,8 +160,10 @@ public class ServerAccess{ return; } + /** - * HTTP-Proxyãè¿ãã + * HTTPéä¿¡ã«ä½¿ãããProxyãè¿ãã + * * @return HTTP-Proxy */ public Proxy getProxy(){ @@ -133,7 +171,8 @@ public class ServerAccess{ } /** - * HTTP-Proxyãè¨å®ããã + * HTTPéä¿¡ã«ä½¿ãããProxyãè¨å®ããã + * * @param proxy HTTP-ProxyãnullãªãProxyãªãã¨è§£éãããã */ public void setProxy(Proxy proxy){ @@ -144,6 +183,7 @@ public class ServerAccess{ /** * å½ã®ãã¼ã¹URLãè¿ãã + * * @return ãã¼ã¹URL */ public URL getBaseURL(){ @@ -152,7 +192,8 @@ public class ServerAccess{ /** * ä¸ããããã¯ã¨ãªã¼ã¨CGIã®URLããæ°ãã«URLãåæããã - * @param query ã¯ã¨ãªã¼ + * + * @param query ?ããå§ã¾ãã¯ã¨ãªã¼ * @return æ°ããªURL */ protected URL getQueryURL(String query){ @@ -171,7 +212,32 @@ public class ServerAccess{ } /** - * ã¨ã³ã³ã¼ãã£ã³ã°ãããå¥åã¹ããªã¼ã ããæååãçæããã + * æå®ãããæã®ææ°Periodã®HTMLãã¼ã¿ã®URLãåå¾ããã + * + * @param village æ + * @return URL + */ + public URL getVillageURL(Village village){ + String query = village.getCGIQuery(); + URL url = getQueryURL(query); + return url; + } + + /** + * æå®ãããPeriodã®HTMLãã¼ã¿ã®URLãåå¾ããã + * + * @param period æ¥ + * @return URL + */ + public URL getPeriodURL(Period period){ + String query = period.getCGIQuery(); + URL url = getQueryURL(query); + return url; + } + + /** + * ã¨ã³ã³ã¼ãã£ã³ã°ãããå¥åã¹ããªã¼ã ããHTMLæååãåä¿¡ããã + * * @param istream å¥åã¹ããªã¼ã * @return æåå * @throws java.io.IOException å¥åºåã¨ã©ã¼ï¼ãããããããã¯ã¼ã¯é¢é£ï¼ @@ -180,12 +246,12 @@ public class ServerAccess{ throws IOException{ DecodeNotifier decoder; ContentBuilder builder; - if(this.charset.name().equalsIgnoreCase("Shift_JIS")){ + if(this.isSJIS){ decoder = new SjisNotifier(); - builder = new ContentBuilderSJ(200 * 1024); - }else if(this.charset.name().equalsIgnoreCase("UTF-8")){ + builder = new ContentBuilderSJ(BUFLEN_CONTENT); + }else if(this.isUTF8){ decoder = new DecodeNotifier(this.charset.newDecoder()); - builder = new ContentBuilder(200 * 1024); + builder = new ContentBuilder(BUFLEN_CONTENT); }else{ assert false; return null; @@ -205,20 +271,8 @@ public class ServerAccess{ } /** - * ä¸ããããã¯ã¨ãªã¼ãç¨ãã¦HTMLãã¼ã¿ãåå¾ããã - * @param query HTTP-GET ã¯ã¨ãªã¼ - * @return HTMLãã¼ã¿ - * @throws java.io.IOException ãããã¯ã¼ã¯ã¨ã©ã¼ - */ - protected HtmlSequence downloadHTML(String query) - throws IOException{ - URL url = getQueryURL(query); - HtmlSequence result = downloadHTML(url); - return result; - } - - /** * ä¸ããããURLãç¨ãã¦HTMLãã¼ã¿ãåå¾ããã + * * @param url URL * @return HTMLãã¼ã¿ * @throws java.io.IOException ãããã¯ã¼ã¯ã¨ã©ã¼ @@ -251,10 +305,11 @@ public class ServerAccess{ return null; } - InputStream stream = TallyInputStream.getInputStream(connection); - DecodedContent html = downloadHTMLStream(stream); + DecodedContent html; + try(InputStream is = TallyInputStream.getInputStream(connection)){ + html = downloadHTMLStream(is); + } - stream.close(); connection.disconnect(); HtmlSequence hseq = new HtmlSequence(url, datems, html); @@ -263,97 +318,22 @@ public class ServerAccess{ } /** - * çµ¶å¯¾ã¾ãã¯ç¸å¯¾URLã®æããã¼ããã³ããªã¤ã¡ã¼ã¸ç»åããã¦ã³ãã¼ãããã - * @param url ç»åURLæåå - * @return ç»åã¤ã¡ã¼ã¸ - * @throws java.io.IOException ãããã¯ã¼ã¯ã¨ã©ã¼ - */ - public BufferedImage downloadImage(String url) throws IOException{ - URL absolute; - try{ - URL base = getBaseURL(); - absolute = new URL(base, url); - }catch(MalformedURLException e){ - assert false; - return null; - } - - BufferedImage image; - image = getImageCache(absolute.toString()); - if(image != null) return image; - - HttpURLConnection connection = - (HttpURLConnection) absolute.openConnection(this.proxy); - connection.setRequestProperty("Accept", "*/*"); - connection.setRequestProperty("User-Agent", USER_AGENT); - connection.setUseCaches(true); - connection.setInstanceFollowRedirects(true); - connection.setDoInput(true); - connection.setRequestMethod("GET"); - - connection.connect(); - - int responseCode = connection.getResponseCode(); - if(responseCode != HttpURLConnection.HTTP_OK){ - String logMessage = "ã¤ã¡ã¼ã¸ã®ãã¦ã³ãã¼ãã«å¤±æãã¾ããã"; - logMessage += HttpUtils.formatHttpStat(connection, 0, 0); - LOGGER.warning(logMessage); - return null; - } - - InputStream stream = TallyInputStream.getInputStream(connection); - image = ImageIO.read(stream); - stream.close(); - - connection.disconnect(); - - putImageCache(absolute.toString(), image); - - return image; - } - - /** - * æå®ãããèªè¨¼æå ±ãPOSTããã - * @param authData èªè¨¼æå ± - * @return èªè¨¼æå ±ãåãå¥ãããããtrue + * ä¸ããããã¯ã¨ãªã¼ãç¨ãã¦HTMLãã¼ã¿ãåå¾ããã + * + * @param query HTTP-GET ã¯ã¨ãªã¼ + * @return HTMLãã¼ã¿ * @throws java.io.IOException ãããã¯ã¼ã¯ã¨ã©ã¼ */ - protected boolean postAuthData(String authData) throws IOException{ - URL url = getQueryURL(""); - HttpURLConnection connection = - (HttpURLConnection) url.openConnection(this.proxy); - connection.setRequestProperty("Accept", "*/*"); - connection.setRequestProperty("User-Agent", USER_AGENT); - connection.setUseCaches(false); - connection.setInstanceFollowRedirects(false); - connection.setDoInput(true); - connection.setDoOutput(true); - connection.setRequestMethod("POST"); - - byte[] authBytes = authData.getBytes(ENC_POST); - - OutputStream os = TallyOutputStream.getOutputStream(connection); - os.write(authBytes); - os.flush(); - os.close(); - - updateLastAccess(connection); - - connection.disconnect(); - - if( ! this.authManager.hasLoggedIn() ){ - String logMessage = "èªè¨¼æå ±ã®éä¿¡ã«å¤±æãã¾ããã"; - LOGGER.warning(logMessage); - return false; - } - - LOGGER.info("æ£ããèªè¨¼ãè¡ããã¾ããã"); - - return true; + protected HtmlSequence downloadHTML(String query) + throws IOException{ + URL url = getQueryURL(query); + HtmlSequence result = downloadHTML(url); + return result; } /** * ããããã¼ã¸ã®HTMLãã¼ã¿ãåå¾ããã + * * @return HTMLãã¼ã¿ * @throws java.io.IOException ãããã¯ã¼ã¯ã¨ã©ã¼ */ @@ -363,6 +343,9 @@ public class ServerAccess{ /** * å½ã«å«ã¾ããæä¸è¦§HTMLãã¼ã¿ãåå¾ããã + * + *

wolfå½ã«ã¯åå¨ããªãã + * * @return HTMLãã¼ã¿ * @throws java.io.IOException ãããã¯ã¼ã¯ã¨ã©ã¼ */ @@ -372,20 +355,24 @@ public class ServerAccess{ /** * æå®ãããæã®Periodä¸è¦§ã®HTMLãã¼ã¿ãåå¾ããã - * ç¾å¨ã²ã¼ã é²è¡ä¸ã®æã«ãå¯è½ã + * + *

ç¾å¨ã²ã¼ã é²è¡ä¸ã®æã«ãå¯è½ã * â» å¤å½ã§ã¯ä½¿ããªããï¼ + * * @param village æ * @return HTMLãã¼ã¿ * @throws java.io.IOException ãããã¯ã¼ã¯ã¨ã©ã¼ */ public HtmlSequence getHTMLBoneHead(Village village) throws IOException{ - String villageID = village.getVillageID(); - return downloadHTML("?vid=" + villageID + "&meslog="); + String query = village.getCGIQuery(); + return downloadHTML(query + "&meslog="); } /** * æå®ãããæã®ææ°Periodã®HTMLãã¼ã¿ããã¼ãããã - * æ¢ã«GAMEOVERã®æã§ã¯Periodä¸è¦§ã®HTMLãã¼ã¿ã¨ãªãã + * + *

æ¢ã«GAMEOVERã®æã§ã¯Periodä¸è¦§ã®HTMLãã¼ã¿ã¨ãªãã + * * @param village æ * @return HTMLãã¼ã¿ * @throws java.io.IOException ãããã¯ã¼ã¯ã¨ã©ã¼ @@ -396,18 +383,8 @@ public class ServerAccess{ } /** - * æå®ãããæã®ææ°Periodã®HTMLãã¼ã¿ã®URLãåå¾ããã - * @param village æ - * @return URL - */ - public URL getVillageURL(Village village){ - String villageID = village.getVillageID(); - URL url = getQueryURL("?vid=" + villageID); - return url; - } - - /** * æå®ãããPeriodã®HTMLãã¼ã¿ããã¼ãããã + * * @param period Period * @return HTMLãã¼ã¿ * @throws java.io.IOException ãããã¯ã¼ã¯ã¨ã©ã¼ @@ -418,79 +395,68 @@ public class ServerAccess{ } /** - * æå®ãããPeriodã®HTMLãã¼ã¿ã®URLãåå¾ããã - * @param period æ¥ - * @return URL - */ - public URL getPeriodURL(Period period){ - String query = period.getCGIQuery(); - URL url = getQueryURL(query); - return url; - } - - /** - * æçµã¢ã¯ã»ã¹æå»ãæ´æ°ããã - * @param connection HTTPæ¥ç¶ - * @return ãªã½ã¼ã¹éä¿¡æå» - */ - public long updateLastAccess(HttpURLConnection connection){ - this.lastServerMs = connection.getDate(); - this.lastLocalMs = System.currentTimeMillis(); - this.lastSystemMs = System.nanoTime() / (1000 * 1000); - return this.lastServerMs; - } - - /** - * ä¸ããããã¦ã¼ã¶IDã¨ãã¹ã¯ã¼ãã§ãã°ã¤ã³å¦çãè¡ãã - * @param userID ã¦ã¼ã¶ID - * @param password ãã¹ã¯ã¼ã - * @return ãã°ã¤ã³ã«æåããã°true + * çµ¶å¯¾ã¾ãã¯ç¸å¯¾URLã®æããã¼ããã³ããªã¤ã¡ã¼ã¸ç»åããã¦ã³ãã¼ãããã + * + * @param url ç»åURLæåå + * @return ç»åã¤ã¡ã¼ã¸ * @throws java.io.IOException ãããã¯ã¼ã¯ã¨ã©ã¼ */ - public final boolean login(String userID, char[] password) - throws IOException{ - if(this.authManager.hasLoggedIn()){ - return true; - } - - String postText = AuthManager.buildLoginPostData(userID, password); - boolean result; + public BufferedImage downloadImage(String url) throws IOException{ + URL absolute; try{ - result = postAuthData(postText); - }catch(IOException e){ - this.authManager.clearAuthentication(); - throw e; + URL base = getBaseURL(); + absolute = new URL(base, url); + }catch(MalformedURLException e){ + assert false; + return null; } - return result; - } + String urlTxt = absolute.toString(); + BufferedImage image; + image = getImageCache(urlTxt); + if(image != null) return image; - /** - * ãã°ã¢ã¦ãå¦çãè¡ãã - * @throws java.io.IOException ãããã¯ã¼ã¯å¥åºåã¨ã©ã¼ - */ - public void logout() throws IOException{ - if( ! this.authManager.hasLoggedIn() ){ - return; + HttpURLConnection connection = + (HttpURLConnection) absolute.openConnection(this.proxy); + connection.setRequestProperty("Accept", "*/*"); + connection.setRequestProperty("User-Agent", USER_AGENT); + connection.setUseCaches(true); + connection.setInstanceFollowRedirects(true); + connection.setDoInput(true); + connection.setRequestMethod("GET"); + + connection.connect(); + + int responseCode = connection.getResponseCode(); + if(responseCode != HttpURLConnection.HTTP_OK){ + String logMessage = "ã¤ã¡ã¼ã¸ã®ãã¦ã³ãã¼ãã«å¤±æãã¾ããã"; + logMessage += HttpUtils.formatHttpStat(connection, 0, 0); + LOGGER.warning(logMessage); + return null; } - try{ - postAuthData(AuthManager.POST_LOGOUT); - }finally{ - this.authManager.clearAuthentication(); + try(InputStream is = TallyInputStream.getInputStream(connection)){ + image = ImageIO.read(is); } - return; + connection.disconnect(); + + putImageCache(urlTxt, image); + + return image; } - // TODO ã·ã£ãããã¦ã³ããã¯ã§ãã°ã¢ã¦ãããããããªâ¦ /** - * ãã°ã¤ã³ä¸ãå¦ãå¤å®ããã - * @return ãã°ã¤ã³ä¸ãªãtrue + * æçµã¢ã¯ã»ã¹æå»ãæ´æ°ããã + * + * @param connection HTTPæ¥ç¶ + * @return ãªã½ã¼ã¹éä¿¡æå» */ - public boolean hasLoggedIn(){ - boolean result = this.authManager.hasLoggedIn(); - return result; + public long updateLastAccess(HttpURLConnection connection){ + this.lastServerMs = connection.getDate(); + this.lastLocalMs = System.currentTimeMillis(); + this.lastSystemMs = System.nanoTime() / (1000 * 1000); + return this.lastServerMs; } } diff --git a/src/main/java/jp/sfjp/jindolf/summary/DaySummary.java b/src/main/java/jp/sfjp/jindolf/summary/DaySummary.java index 901f5d2..35155b4 100644 --- a/src/main/java/jp/sfjp/jindolf/summary/DaySummary.java +++ b/src/main/java/jp/sfjp/jindolf/summary/DaySummary.java @@ -50,6 +50,7 @@ import jp.sfjp.jindolf.data.Topic; import jp.sfjp.jindolf.data.Village; import jp.sfjp.jindolf.glyph.TalkDraw; import jp.sfjp.jindolf.util.GUIUtils; +import jp.sfjp.jindolf.view.AvatarPics; import jp.sourceforge.jindolf.corelib.TalkType; /** @@ -451,8 +452,9 @@ public class DaySummary extends JDialog Avatar avatar = (Avatar) value; Village village = DaySummary.this.period.getVillage(); - Image image = village.getAvatarFaceImage(avatar); - if(image == null) image = village.getGraveImage(); + AvatarPics avatarPics = village.getAvatarPics(); + Image image = avatarPics.getAvatarFaceImage(avatar); + if(image == null) image = avatarPics.getGraveImage(); if(image != null){ ImageIcon icon = new ImageIcon(image); setIcon(icon); diff --git a/src/main/java/jp/sfjp/jindolf/summary/GameSummary.java b/src/main/java/jp/sfjp/jindolf/summary/GameSummary.java index 1d66056..d0e37e0 100644 --- a/src/main/java/jp/sfjp/jindolf/summary/GameSummary.java +++ b/src/main/java/jp/sfjp/jindolf/summary/GameSummary.java @@ -22,13 +22,15 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; import jp.sfjp.jindolf.VerInfo; import jp.sfjp.jindolf.data.Avatar; +import jp.sfjp.jindolf.data.InterPlay; import jp.sfjp.jindolf.data.Period; import jp.sfjp.jindolf.data.Player; import jp.sfjp.jindolf.data.SysEvent; import jp.sfjp.jindolf.data.Talk; -import jp.sfjp.jindolf.data.Topic; import jp.sfjp.jindolf.data.Village; import jp.sfjp.jindolf.dxchg.FaceIconSet; import jp.sfjp.jindolf.dxchg.WolfBBS; @@ -109,40 +111,38 @@ public class GameSummary{ /** * ãã¬ã¤ã¤ã¼ã®ãªã¹ãããå½¹è·ãã©ã³ã¹æååãå¾ãã - * ex) "ææå éçç¼" + * + *

ex) "ææå éçç¼" + * * @param players ãã¬ã¤ã¤ã¼ã®ãªã¹ã * @return å½¹è·ãã©ã³ã¹æåå */ public static String getRoleBalanceSequence(List players){ - List roleList = new LinkedList<>(); - for(Player player : players){ - GameRole role = player.getRole(); - roleList.add(role); - } - Collections.sort(roleList, GameRole.getPowerBalanceComparator()); - StringBuilder result = new StringBuilder(); - for(GameRole role : roleList){ - char ch = role.getShortName(); - result.append(ch); - } + + players.stream() + .map(player -> player.getRole()) + .sorted(GameRole.getPowerBalanceComparator()) + .map(role -> role.getShortName()) + .forEachOrdered(ch -> result.append(ch)); return result.toString(); } + /** * ãµãã©ã¤ãºå¦çã */ private void summarize(){ buildEventMap(); + buildPlayerList(); summarizeTime(); summarizeWinner(); - summarizePlayers(); - for(Period period : this.village.getPeriodList()){ + this.village.getPeriodList().forEach(period -> { summarizePeriod(period); - } + }); summarizeJudge(); summarizeGuard(); @@ -154,20 +154,58 @@ public class GameSummary{ * SysEventã®ç¨®å¥ãã¨ã«éè¨ããã */ private void buildEventMap(){ - for(SysEventType type : SysEventType.values()){ - List eventList = new LinkedList<>(); - this.eventMap.put(type, eventList); - } + Stream.of(SysEventType.values()) + .forEach(type -> { + this.eventMap.put(type, new LinkedList<>()); + }); + + this.village.getPeriodList().stream() + .flatMap(period -> period.getTopicList().stream()) + .filter(topic -> (topic instanceof SysEvent) ) + .map(topic -> (SysEvent) topic) + .forEachOrdered(event -> { + SysEventType type = event.getSysEventType(); + List eventList = this.eventMap.get(type); + eventList.add(event); + }); - for(Period period : this.village.getPeriodList()){ - for(Topic topic : period.getTopicList()){ - if( ! (topic instanceof SysEvent) ) continue; - SysEvent event = (SysEvent) topic; - SysEventType type = event.getSysEventType(); - List eventList = this.eventMap.get(type); - eventList.add(event); - } - } + return; + } + + /** + * playerListã¤ãã³ãã¨onStageã¤ãã³ãã®åå®¹ãä»ãåããã + * Playerä¸è¦§æå ±ãå®æãããã + * + *

ãããã¼ã°ã§å¤±è¸ªããPlayerã¯å¯¾è±¡å¤ã + */ + private void buildPlayerList(){ + List playerListEventList = + this.eventMap.get(SysEventType.PLAYERLIST); + assert playerListEventList.size() == 1; + SysEvent playerListEvent = playerListEventList.get(0); + + List players = playerListEvent.getPlayerList(); + players.forEach( player -> { + Avatar avatar = player.getAvatar(); + this.playerMap.put(avatar, player); + this.playerList.add(player); + }); + + List onStageEventList = + this.eventMap.get(SysEventType.ONSTAGE); + onStageEventList.stream() + .map(onStageEvent -> onStageEvent.getPlayerList().get(0)) + .forEachOrdered(onStagePlayer -> { + Avatar avatar = onStagePlayer.getAvatar(); + Player listPlayer = this.playerMap.get(avatar); + if(listPlayer != null){ + int entryNo = onStagePlayer.getEntryNo(); + listPlayer.setEntryNo(entryNo); + }else{ + assert true; + // ãã¬ã¤ã¤ã¼å¤±è¸ªï¼ + } + }); return; } @@ -199,117 +237,68 @@ public class GameSummary{ } /** - * åå èéè¨ã - */ - private void summarizePlayers(){ - List eventList; - - List avatarList; - List roleList; - List integerList; - List textList; - - eventList = this.eventMap.get(SysEventType.ONSTAGE); - for(SysEvent event : eventList){ - avatarList = event.getAvatarList(); - integerList = event.getIntegerList(); - Avatar onstageAvatar = avatarList.get(0); - Player onstagePlayer = registPlayer(onstageAvatar); - onstagePlayer.setEntryNo(integerList.get(0)); - } - - eventList = this.eventMap.get(SysEventType.PLAYERLIST); - assert eventList.size() == 1; - SysEvent event = eventList.get(0); - - avatarList = event.getAvatarList(); - roleList = event.getRoleList(); - integerList = event.getIntegerList(); - textList = event.getCharSequenceList(); - int avatarNum = avatarList.size(); - for(int idx = 0; idx < avatarNum; idx++){ - Avatar avatar = avatarList.get(idx); - GameRole role = roleList.get(idx); - CharSequence urlText = textList.get(idx * 2); - CharSequence idName = textList.get(idx * 2 + 1); - int liveOrDead = integerList.get(idx); - - Player player = registPlayer(avatar); - player.setRole(role); - player.setUrlText(urlText.toString()); - player.setIdName(idName.toString()); - if(liveOrDead != 0){ // çå - player.setObitDay(-1); - player.setDestiny(Destiny.ALIVE); - } - - this.playerList.add(player); - } - - return; - } - - /** * Periodã®ãµãã©ã¤ãºã + * * @param period Period */ private void summarizePeriod(Period period){ int day = period.getDay(); - for(Topic topic : period.getTopicList()){ - if(topic instanceof SysEvent){ - SysEvent sysEvent = (SysEvent) topic; - summarizeDestiny(day, sysEvent); - } - } + + period.getTopicList().stream() + .filter(topic -> topic instanceof SysEvent) + .map(topic -> (SysEvent) topic) + .forEachOrdered(sysEvent -> { + summarizeDestiny(day, sysEvent); + }); return; } /** * åãã¬ã¤ã¤ã¼éå½ã®ãµãã©ã¤ãºã + * * @param day æ¥ * @param sysEvent ã·ã¹ãã ã¤ãã³ã */ private void summarizeDestiny(int day, SysEvent sysEvent){ - List avatarList = sysEvent.getAvatarList(); - List integerList = sysEvent.getIntegerList(); - - int avatarTotal = avatarList.size(); - Avatar lastAvatar = null; - if(avatarTotal > 0) lastAvatar = avatarList.get(avatarTotal - 1); + List deadAvatars = new LinkedList<>(); + Destiny destiny; SysEventType eventType = sysEvent.getSysEventType(); + switch(eventType){ + case COUNTING: // Gå½COUNTING2ã¯éå½ã«é¢ä¿ãªã case EXECUTION: // Gå½ã®ã¿ - if(integerList.get(avatarTotal - 1) > 0) break; // å¦åç¡ã - Player executedPl = registPlayer(lastAvatar); - executedPl.setDestiny(Destiny.EXECUTED); - executedPl.setObitDay(day); + Avatar executedAvatar = sysEvent.getExecutedAvatar(); + if(executedAvatar == null) return; + deadAvatars.add(executedAvatar); + destiny = Destiny.EXECUTED; break; case SUDDENDEATH: + List avatarList = sysEvent.getAvatarList(); Avatar suddenDeathAvatar = avatarList.get(0); - Player suddenDeathPlayer = registPlayer(suddenDeathAvatar); - suddenDeathPlayer.setDestiny(Destiny.SUDDENDEATH); - suddenDeathPlayer.setObitDay(day); - break; - case COUNTING: // Gå½COUNTING2ã¯éå½ã«é¢ä¿ãªã - if(avatarTotal % 2 == 0) break; // å¦åç¡ã - Player executedPlayer = registPlayer(lastAvatar); - executedPlayer.setDestiny(Destiny.EXECUTED); - executedPlayer.setObitDay(day); + deadAvatars.add(suddenDeathAvatar); + destiny = Destiny.SUDDENDEATH; break; case MURDERED: - for(Avatar avatar : avatarList){ - Player player = registPlayer(avatar); - player.setDestiny(Destiny.EATEN); - player.setObitDay(day); - } // TODO Eå½ãã æº¶ãå¦çã¯å¾åã + sysEvent.getAvatarList().stream() + .forEach(avatar -> { + deadAvatars.add(avatar); + }); + destiny = Destiny.EATEN; break; default: - break; + return; } + deadAvatars.stream() + .map(avatar -> getPlayer(avatar)) + .forEach(player -> { + player.setDestiny(destiny); + player.setObitDay(day); + }); + return; } @@ -317,21 +306,17 @@ public class GameSummary{ * ä¼è©±æå»ã®ãµãã©ã¤ãºã */ private void summarizeTime(){ - for(Period period : this.village.getPeriodList()){ - for(Topic topic : period.getTopicList()){ - if( ! (topic instanceof Talk) ) continue; - Talk talk = (Talk) topic; - - long epoch = talk.getTimeFromID(); - - if(this.talk1stTimeMs < 0) this.talk1stTimeMs = epoch; - if(this.talkLastTimeMs < 0) this.talkLastTimeMs = epoch; - - if(epoch < this.talk1stTimeMs ) this.talk1stTimeMs = epoch; - if(epoch > this.talkLastTimeMs) this.talkLastTimeMs = epoch; - } - } - + this.village.getPeriodList().stream() + .flatMap(period -> period.getTopicList().stream()) + .filter(topic -> topic instanceof Talk) + .mapToLong(topic -> ((Talk) topic).getTimeFromID()) + .forEach(epoch -> { + if(this.talk1stTimeMs < 0) this.talk1stTimeMs = epoch; + if(this.talkLastTimeMs < 0) this.talkLastTimeMs = epoch; + + if(epoch < this.talk1stTimeMs ) this.talk1stTimeMs = epoch; + if(epoch > this.talkLastTimeMs) this.talkLastTimeMs = epoch; + }); return; } @@ -342,9 +327,10 @@ public class GameSummary{ List eventList = this.eventMap.get(SysEventType.JUDGE); for(SysEvent event : eventList){ - List avatarList = event.getAvatarList(); - Avatar avatar = avatarList.get(1); - Player seered = getPlayer(avatar); + List interPlayList = event.getInterPlayList(); + InterPlay judge = interPlayList.get(0); + Avatar target = judge.getTarget(); + Player seered = getPlayer(target); GameRole role = seered.getRole(); switch(role){ case WOLF: this.ctScryWolf++; break; @@ -359,6 +345,7 @@ public class GameSummary{ /** * å ãå¸«ã®æ´»åãæåååããã + * * @return å ãå¸«ã®æ´»å */ public CharSequence dumpSeerActivity(){ @@ -407,9 +394,10 @@ public class GameSummary{ eventList = this.eventMap.get(SysEventType.GUARD); for(SysEvent event : eventList){ - List avatarList = event.getAvatarList(); - Avatar avatar = avatarList.get(1); - Player guarded = getPlayer(avatar); + List interPlayList = event.getInterPlayList(); + InterPlay guard = interPlayList.get(0); + Avatar target = guard.getTarget(); + Player guarded = getPlayer(target); GameRole guardedRole = guarded.getRole(); switch(guardedRole){ case WOLF: this.ctGuardWolf++; break; @@ -419,15 +407,16 @@ public class GameSummary{ } } - for(Period period : this.village.getPeriodList()){ + this.village.getPeriodList().forEach(period -> { summarizeGjPeriod(period); - } + }); return; } /** * ç©äººGJã®æ¥ãã¨ã®éè¨ã + * * @param period æ¥ */ private void summarizeGjPeriod(Period period){ @@ -468,7 +457,8 @@ public class GameSummary{ if(sysEvent == null) return; if(hasAssaultTried){ - Avatar guarded = sysEvent.getAvatarList().get(1); + InterPlay inter = sysEvent.getInterPlayList().get(0); + Avatar guarded = inter.getTarget(); Player guardedPlayer = getPlayer(guarded); GameRole guardedRole = guardedPlayer.getRole(); switch(guardedRole){ @@ -485,6 +475,7 @@ public class GameSummary{ /** * ç©äººã®æ´»åãæåååããã + * * @return ç©äººã®æ´»å */ public CharSequence dumpHunterActivity(){ @@ -558,6 +549,7 @@ public class GameSummary{ /** * å¦åæ¦è¦³ãæåååããã + * * @return æåååããå¦åæ¦è¦³ */ public CharSequence dumpExecutionInfo(){ @@ -597,6 +589,7 @@ public class GameSummary{ /** * è¥²ææ¦è¦³ãæåååããã + * * @return æåååããè¥²ææ¦è¦³ */ public CharSequence dumpAssaultInfo(){ @@ -636,23 +629,28 @@ public class GameSummary{ /** * ã¾ã¨ããµã¤ãç¨æç¥¨Boxãçæããã + * * @return æç¥¨Boxã®Wikiããã¹ã */ public CharSequence dumpVoteBox(){ StringBuilder wikiText = new StringBuilder(); - for(Player player : getCastingPlayerList()){ - Avatar avatar = player.getAvatar(); - if(avatar == Avatar.AVATAR_GERD) continue; - GameRole role = player.getRole(); - CharSequence fullName = avatar.getFullName(); - CharSequence roleName = role.getRoleName(); - StringBuilder line = new StringBuilder(); - line.append("[").append(roleName).append("] ").append(fullName); - if(wikiText.length() > 0) wikiText.append(','); - wikiText.append(WolfBBS.escapeWikiSyntax(line)); - wikiText.append("[0]"); - } + getCastingPlayerList().stream() + .filter(player -> + ! player.getAvatar().equals(Avatar.AVATAR_GERD) + ) + .forEach(player -> { + Avatar avatar = player.getAvatar(); + GameRole role = player.getRole(); + CharSequence fullName = avatar.getFullName(); + CharSequence roleName = role.getRoleName(); + StringBuilder line = new StringBuilder(); + line.append("[").append(roleName).append("] ") + .append(fullName); + if(wikiText.length() > 0) wikiText.append(','); + wikiText.append(WolfBBS.escapeWikiSyntax(line)); + wikiText.append("[0]"); + }); wikiText.insert(0, "#vote(").append(")\n"); @@ -661,6 +659,7 @@ public class GameSummary{ /** * ã¾ã¨ããµã¤ãç¨ãã£ã¹ãè¡¨ãçæããã + * * @param iconSet é¡ã¢ã¤ã³ã³ã»ãã * @return ãã£ã¹ãè¡¨ã®Wikiããã¹ã */ @@ -809,6 +808,7 @@ public class GameSummary{ /** * æè©³ç´°æå ±ãåºåããã + * * @return æè©³ç´°æå ± */ public CharSequence dumpVillageWiki(){ @@ -911,6 +911,7 @@ public class GameSummary{ /** * æåã®çºè¨ã®æå»ãå¾ãã + * * @return æå» */ public Date get1stTalkDate(){ @@ -919,6 +920,7 @@ public class GameSummary{ /** * æå¾ã®çºè¨ã®æå»ãå¾ãã + * * @return æå» */ public Date getLastTalkDate(){ @@ -927,6 +929,7 @@ public class GameSummary{ /** * æå®ããæ¥ã®çåèä¸è¦§ãå¾ãã + * * @param day æ¥ * @return çåèä¸è¦§ */ @@ -946,32 +949,34 @@ public class GameSummary{ } if(period.isEpilogue()){ - for(Player player : this.playerList){ - if(player.getDestiny() == Destiny.ALIVE){ - result.add(player); - } - } + this.playerList.stream() + .filter(player -> player.getDestiny() == Destiny.ALIVE) + .forEachOrdered(player -> { + result.add(player); + }); return result; } - for(Topic topic : period.getTopicList()){ - if( ! (topic instanceof SysEvent) ) continue; - SysEvent sysEvent = (SysEvent) topic; - if(sysEvent.getSysEventType() == SysEventType.SURVIVOR){ - List avatarList = sysEvent.getAvatarList(); - for(Avatar avatar : avatarList){ + period.getTopicList().stream() + .filter(topic -> topic instanceof SysEvent) + .map(topic -> (SysEvent) topic) + .filter(sysEvent -> + sysEvent.getSysEventType() == SysEventType.SURVIVOR + ) + .flatMap(sysEvent -> sysEvent.getAvatarList().stream()) + .forEachOrdered(avatar -> { Player player = getPlayer(avatar); result.add(player); - } - } - } + }); return result; } /** * ãã¬ã¤ã¤ã¼ä¸è¦§ãå¾ãã - * åå ã¨ã³ããªã¼é + * + *

åå ã¨ã³ããªã¼é + * * @return ãã¬ã¤ã¤ã¼ã®ãªã¹ã */ public List getPlayerList(){ @@ -981,6 +986,7 @@ public class GameSummary{ /** * ãã£ã¹ãã£ã³ã°è¡¨ç¨ã«ã½ã¼ãããããã¬ã¤ã¤ã¼ä¸è¦§ãå¾ãã + * * @return ãã¬ã¤ã¤ã¼ã®ãªã¹ã */ public List getCastingPlayerList(){ @@ -993,23 +999,20 @@ public class GameSummary{ /** * æå®ãããå½¹è·ã®ãã¬ã¤ã¤ã¼ä¸è¦§ãå¾ãã + * * @param role å½¹è· * @return å½¹è·ã«åè´ãããã¬ã¤ã¤ã¼ã®ãªã¹ã */ public List getRoledPlayerList(GameRole role){ - List result = new LinkedList<>(); - - for(Player player : this.playerList){ - if(player.getRole() == role){ - result.add(player); - } - } - + List result = this.playerList.stream() + .filter(player -> player.getRole() == role) + .collect(Collectors.toList()); return result; } /** * åå©é£å¶ãå¾ãã + * * @return åå©ããé£å¶ */ public Team getWinnerTeam(){ @@ -1018,18 +1021,21 @@ public class GameSummary{ /** * çªç¶æ»èæ°ãå¾ãã + * * @return çªç¶æ»èæ° */ public int countSuddenDeath(){ - int suddenDeath = 0; - for(Player player : this.playerList){ - if(player.getDestiny() == Destiny.SUDDENDEATH) suddenDeath++; - } - return suddenDeath; + long suddenDeath = this.playerList.stream() + .filter(player -> player.getDestiny() == Destiny.SUDDENDEATH) + .count(); + + int result = (int) suddenDeath; + return result; } /** * åå ãã¬ã¤ã¤ã¼ç·æ°ãå¾ãã + * * @return ãã¬ã¤ã¤ã¼ç·æ° */ public int countAvatarNum(){ @@ -1039,7 +1045,9 @@ public class GameSummary{ /** * AvatarããPlayerãå¾ãã - * åå ãã¦ããªãAvatarãªãnullãè¿ãã + * + *

åå ãã¦ããªãAvatarãªãnullãè¿ãã + * * @param avatar Avatar * @return Player */ @@ -1049,24 +1057,9 @@ public class GameSummary{ } /** - * AvatarããPlayerãå¾ãã - * ç¡ããã°æ°è¦ã«ä½ãã - * @param avatar Avatar - * @return Player - */ - private Player registPlayer(Avatar avatar){ - Player player = getPlayer(avatar); - if(player == null){ - player = new Player(); - player.setAvatar(avatar); - this.playerMap.put(avatar, player); - } - return player; - } - - /** * ãã¬ã¤ã¤ã¼ã®ã½ã¼ãä»æ§ã®è¨è¿°ã - * ã¾ã¨ããµã¤ãã®ãã£ã¹ãè¡¨åãã + * + *

ã¾ã¨ããµã¤ãã®ãã£ã¹ãè¡¨åãã */ private static final class CastingComparator implements Comparator { @@ -1081,6 +1074,7 @@ public class GameSummary{ /** * {@inheritDoc} + * * @param p1 {@inheritDoc} * @param p2 {@inheritDoc} * @return {@inheritDoc} diff --git a/src/main/java/jp/sfjp/jindolf/summary/VillageDigest.java b/src/main/java/jp/sfjp/jindolf/summary/VillageDigest.java index 17c7014..3c58acc 100644 --- a/src/main/java/jp/sfjp/jindolf/summary/VillageDigest.java +++ b/src/main/java/jp/sfjp/jindolf/summary/VillageDigest.java @@ -52,6 +52,7 @@ import jp.sfjp.jindolf.dxchg.WebButton; import jp.sfjp.jindolf.dxchg.WolfBBS; import jp.sfjp.jindolf.util.GUIUtils; import jp.sfjp.jindolf.util.Monodizer; +import jp.sfjp.jindolf.view.AvatarPics; import jp.sourceforge.jindolf.corelib.GameRole; import jp.sourceforge.jindolf.corelib.Team; @@ -756,7 +757,8 @@ public class VillageDigest this.nextPlayer.setEnabled(true); } - Image image = this.village.getAvatarFaceImage(avatar); + AvatarPics avatarPics = this.village.getAvatarPics(); + Image image = avatarPics.getAvatarFaceImage(avatar); this.faceIcon.setImage(image); this.faceLabel.setIcon(null); // ãªãããããå¿è¦ this.faceLabel.setIcon(this.faceIcon); diff --git a/src/main/java/jp/sfjp/jindolf/util/StringUtils.java b/src/main/java/jp/sfjp/jindolf/util/StringUtils.java index 692369f..830fa90 100644 --- a/src/main/java/jp/sfjp/jindolf/util/StringUtils.java +++ b/src/main/java/jp/sfjp/jindolf/util/StringUtils.java @@ -7,8 +7,6 @@ package jp.sfjp.jindolf.util; -import java.util.regex.Matcher; - /** * æååã¦ã¼ãã£ãªãã£ã¯ã©ã¹ã */ @@ -28,55 +26,6 @@ public final class StringUtils{ /** - * æ£è¦è¡¨ç¾ã«ãããããé åãæ°å¤åããã - * @param seq æåå - * @param matcher Matcher - * @param groupIndex åæ¹æå®ã°ã«ã¼ãçªå· - * @return æ°å¤ - * @throws IndexOutOfBoundsException ä¸æ£ãªã°ã«ã¼ãçªå· - */ - public static int parseInt(CharSequence seq, - Matcher matcher, - int groupIndex ) - throws IndexOutOfBoundsException { - return parseInt(seq, - matcher.start(groupIndex), - matcher.end(groupIndex) ); - } - - /** - * æååãæ°å¤åããã - * @param seq æåå - * @return æ°å¤ - */ - public static int parseInt(CharSequence seq){ - return parseInt(seq, 0, seq.length()); - } - - /** - * é¨åæååãæ°å¤åããã - * @param seq æåå - * @param startPos ç¯å²éå§ä½ç½® - * @param endPos ç¯å²çµäºä½ç½® - * @return ãã¼ã¹ããæ°å¤ - * @throws IndexOutOfBoundsException ä¸æ£ãªä½ç½®æå® - */ - public static int parseInt(CharSequence seq, int startPos, int endPos) - throws IndexOutOfBoundsException{ - int result = 0; - - for(int pos = startPos; pos < endPos; pos++){ - char ch = seq.charAt(pos); - int digit = Character.digit(ch, 10); - if(digit < 0) break; - result *= 10; - result += digit; - } - - return result; - } - - /** * é·ãæååãä¸ç¹ãªã¼ãã§çç¥ããã * ãabcdefgãâãabcâ¦efgã * @param str æåå @@ -94,34 +43,6 @@ public final class StringUtils{ } /** - * ããæååã®æ«å°¾ãå¥ã®æååã«ä¸è´ãããå¤å®ããã - * @param target å¤å®å¯¾è±¡ - * @param term æ«å°¾æå - * @return ä¸è´ããã°true - * @throws java.lang.NullPointerException å¼æ°ãnull - * @see String#endsWith(String) - */ - public static boolean isTerminated(CharSequence target, - CharSequence term) - throws NullPointerException{ - if(target == null || term == null) throw new NullPointerException(); - - int targetLength = target.length(); - int termLength = term .length(); - - int offset = targetLength - termLength; - if(offset < 0) return false; - - for(int pos = 0; pos < termLength; pos++){ - char targetch = target.charAt(offset + pos); - char termch = term .charAt(0 + pos); - if(targetch != termch) return false; - } - - return true; - } - - /** * ãµãã·ã¼ã±ã³ã¹åå£«ãæ¯è¼ããã * @param seq1 ãµãã·ã¼ã±ã³ã¹1 * @param start1 éå§ã¤ã³ããã¯ã¹1 diff --git a/src/main/java/jp/sfjp/jindolf/view/AccountPanel.java b/src/main/java/jp/sfjp/jindolf/view/AccountPanel.java deleted file mode 100644 index 1c26d24..0000000 --- a/src/main/java/jp/sfjp/jindolf/view/AccountPanel.java +++ /dev/null @@ -1,499 +0,0 @@ -/* - * Account panel - * - * License : The MIT License - * Copyright(c) 2008 olyutorskii - */ - -package jp.sfjp.jindolf.view; - -import java.awt.BorderLayout; -import java.awt.Container; -import java.awt.Frame; -import java.awt.GridBagConstraints; -import java.awt.GridBagLayout; -import java.awt.Insets; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.ItemEvent; -import java.awt.event.ItemListener; -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; -import java.util.logging.Level; -import java.util.logging.Logger; -import javax.swing.BorderFactory; -import javax.swing.JButton; -import javax.swing.JComboBox; -import javax.swing.JComponent; -import javax.swing.JDialog; -import javax.swing.JLabel; -import javax.swing.JOptionPane; -import javax.swing.JPanel; -import javax.swing.JPasswordField; -import javax.swing.JSeparator; -import javax.swing.JTextArea; -import javax.swing.JTextField; -import javax.swing.border.Border; -import jp.sfjp.jindolf.VerInfo; -import jp.sfjp.jindolf.data.Land; -import jp.sfjp.jindolf.data.LandsModel; -import jp.sfjp.jindolf.dxchg.TextPopup; -import jp.sfjp.jindolf.net.ServerAccess; -import jp.sfjp.jindolf.util.GUIUtils; -import jp.sfjp.jindolf.util.Monodizer; -import jp.sourceforge.jindolf.corelib.LandState; - -/** - * ãã°ã¤ã³ããã«ã - */ -@SuppressWarnings("serial") -public class AccountPanel - extends JDialog - implements ActionListener, ItemListener{ - - private static final Logger LOGGER = Logger.getAnonymousLogger(); - - - private final Map landUserIDMap = - new HashMap<>(); - private final Map landPasswordMap = - new HashMap<>(); - - private final JComboBox landBox = new JComboBox<>(); - private final JTextField idField = new JTextField(15); - private final JPasswordField pwField = new JPasswordField(15); - private final JButton loginButton = new JButton("ãã°ã¤ã³"); - private final JButton logoutButton = new JButton("ãã°ã¢ã¦ã"); - private final JButton closeButton = new JButton("éãã"); - private final JTextArea status = new JTextArea(); - - /** - * ã¢ã«ã¦ã³ãããã«ãçæã - * @param owner ãã¬ã¼ã ãªã¼ãã¼ - */ - @SuppressWarnings("LeakingThisInConstructor") - public AccountPanel(Frame owner){ - super(owner); - setModal(true); - - GUIUtils.modifyWindowAttributes(this, true, false, true); - - this.landBox.setToolTipText("ã¢ã«ã¦ã³ãç®¡çããå½ãé¸ã¶"); - this.idField.setToolTipText("IDãå¥åãã¦ãã ãã"); - this.pwField.setToolTipText("ãã¹ã¯ã¼ããå¥åãã¦ãã ãã"); - - Monodizer.monodize(this.idField); - Monodizer.monodize(this.pwField); - - this.idField.setMargin(new Insets(1, 4, 1, 4)); - this.pwField.setMargin(new Insets(1, 4, 1, 4)); - - this.idField.setComponentPopupMenu(new TextPopup()); - - this.landBox.setEditable(false); - this.landBox.addItemListener(this); - - this.status.setEditable(false); - this.status.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); - this.status.setRows(2); - this.status.setLineWrap(true); - - this.loginButton.addActionListener(this); - this.logoutButton.addActionListener(this); - this.closeButton.addActionListener(this); - - getRootPane().setDefaultButton(this.loginButton); - - Container content = getContentPane(); - GridBagLayout layout = new GridBagLayout(); - GridBagConstraints constraints = new GridBagConstraints(); - content.setLayout(layout); - - constraints.gridwidth = GridBagConstraints.REMAINDER; - constraints.weightx = 1.0; - constraints.insets = new Insets(5, 5, 5, 5); - - JComponent accountPanel = createCredential(); - JComponent buttonPanel = createButtonPanel(); - - constraints.weighty = 0.0; - constraints.fill = GridBagConstraints.HORIZONTAL; - content.add(accountPanel, constraints); - - Border border = BorderFactory.createTitledBorder("ãã°ã¤ã³ã¹ãã¼ã¿ã¹"); - JPanel panel = new JPanel(); - panel.setLayout(new BorderLayout()); - panel.add(this.status, BorderLayout.CENTER); - panel.setBorder(border); - - constraints.weighty = 1.0; - constraints.fill = GridBagConstraints.BOTH; - content.add(panel, constraints); - - constraints.weighty = 0.0; - constraints.fill = GridBagConstraints.HORIZONTAL; - content.add(new JSeparator(), constraints); - - content.add(buttonPanel, constraints); - - return; - } - - /** - * èªè¨¼ããã«ãçæããã - * @return èªè¨¼ããã« - */ - private JComponent createCredential(){ - JPanel credential = new JPanel(); - - GridBagLayout layout = new GridBagLayout(); - GridBagConstraints constraints = new GridBagConstraints(); - - credential.setLayout(layout); - - constraints.insets = new Insets(5, 5, 5, 5); - constraints.fill = GridBagConstraints.NONE; - - constraints.anchor = GridBagConstraints.EAST; - credential.add(new JLabel("å½å :"), constraints); - constraints.anchor = GridBagConstraints.WEST; - credential.add(this.landBox, constraints); - - constraints.gridy = 1; - constraints.anchor = GridBagConstraints.EAST; - constraints.weightx = 0.0; - constraints.fill = GridBagConstraints.NONE; - credential.add(new JLabel("ID :"), constraints); - constraints.anchor = GridBagConstraints.WEST; - constraints.weightx = 1.0; - constraints.fill = GridBagConstraints.HORIZONTAL; - credential.add(this.idField, constraints); - - constraints.gridy = 2; - constraints.anchor = GridBagConstraints.EAST; - constraints.weightx = 0.0; - constraints.fill = GridBagConstraints.NONE; - credential.add(new JLabel("ãã¹ã¯ã¼ã :"), constraints); - constraints.anchor = GridBagConstraints.WEST; - constraints.weightx = 1.0; - constraints.fill = GridBagConstraints.HORIZONTAL; - credential.add(this.pwField, constraints); - - return credential; - } - - /** - * ãã¿ã³ããã«ã®ä½æã - * @return ãã¿ã³ããã« - */ - private JComponent createButtonPanel(){ - JPanel buttonPanel = new JPanel(); - - GridBagLayout layout = new GridBagLayout(); - GridBagConstraints constraints = new GridBagConstraints(); - - buttonPanel.setLayout(layout); - - constraints.fill = GridBagConstraints.NONE; - constraints.anchor = GridBagConstraints.WEST; - constraints.weightx = 0.0; - constraints.weighty = 0.0; - - buttonPanel.add(this.loginButton, constraints); - - constraints.insets = new Insets(0, 5, 0, 0); - buttonPanel.add(this.logoutButton, constraints); - - constraints.anchor = GridBagConstraints.EAST; - constraints.weightx = 1.0; - constraints.insets = new Insets(0, 15, 0, 0); - buttonPanel.add(this.closeButton, constraints); - - return buttonPanel; - } - - /** - * ç¾å¨ã³ã³ãããã¯ã¹ã§é¸æä¸ã®å½ãè¿ãã - * @return ç¾å¨é¸æä¸ã®Land - */ - private Land getSelectedLand(){ - Land land = (Land) ( this.landBox.getSelectedItem() ); - return land; - } - - /** - * ACTIVEãªæåã®å½ãã³ã³ãããã¯ã¹ã§æ¢ã«é¸æããã¦ããç¶æã«ããã - */ - private void preSelectActiveLand(){ - for(int index = 0; index < this.landBox.getItemCount(); index++){ - Object item = this.landBox.getItemAt(index); - Land land = (Land) item; - LandState state = land.getLandDef().getLandState(); - if(state == LandState.ACTIVE){ - this.landBox.setSelectedItem(land); - return; - } - } - return; - } - - /** - * æå®ãããå½ã®ã¦ã¼ã¶IDãè¿ãã - * @param land å½ - * @return ã¦ã¼ã¶ID - */ - private String getUserID(Land land){ - return this.landUserIDMap.get(land); - } - - /** - * æå®ãããå½ã®ãã¹ã¯ã¼ããè¿ãã - * @param land å½ - * @return ãã¹ã¯ã¼ã - */ - private char[] getPassword(Land land){ - return this.landPasswordMap.get(land); - } - - /** - * ãããã¯ã¼ã¯ã¨ã©ã¼ãéç¥ããã¢ã¼ãã«ãã¤ã¢ãã°ãè¡¨ç¤ºããã - * OKãã¿ã³ãæ¼ãã¾ã§ãã®ã¡ã½ããã¯æ»ã£ã¦ããªãã - * @param e ãããã¯ã¼ã¯ã¨ã©ã¼ - */ - protected void showNetworkError(IOException e){ - LOGGER.log(Level.WARNING, - "ã¢ã«ã¦ã³ãå¦çä¸ã«ãããã¯ã¼ã¯ã®ãã©ãã«ãçºçãã¾ãã", e); - - Land land = getSelectedLand(); - ServerAccess server = land.getServerAccess(); - String message = - land.getLandDef().getLandName() - +"ãéå¶ãããµã¼ãã¨ã®éã®éä¿¡ã§" - +"ä½ããã®ãã©ãã«ãçºçãã¾ããã\n" - +"ç¸æãµã¼ãã®URLã¯ [ " + server.getBaseURL() + " ] ã ãã\n" - +"Webãã©ã¦ã¶ã§ãéã¹ãªããç¢ºèªãã¦ã¿ã¦ãï¼\n"; - - JOptionPane pane = new JOptionPane(message, - JOptionPane.WARNING_MESSAGE, - JOptionPane.DEFAULT_OPTION ); - - String title = VerInfo.getFrameTitle("éä¿¡ç°å¸¸çºç"); - JDialog dialog = pane.createDialog(this, title); - - dialog.pack(); - dialog.setVisible(true); - dialog.dispose(); - - return; - } - - /** - * ã¢ã«ã¦ã³ãã¨ã©ã¼ãéç¥ããã¢ã¼ãã«ãã¤ã¢ãã°ãè¡¨ç¤ºããã - * OKãã¿ã³ãæ¼ãã¾ã§ãã®ã¡ã½ããã¯æ»ã£ã¦ããªãã - */ - protected void showIllegalAccountDialog(){ - Land land = getSelectedLand(); - String message = - land.getLandDef().getLandName() - +"ã¸ã®ãã°ã¤ã³ã«å¤±æãã¾ããã\n" - +"ã¦ã¼ã¶åã¨ãã¹ã¯ã¼ãã¯æ¬å½ã«æ£ããããªï¼\n" - +"ããªãã¯æ¬å½ã« [ " + getUserID(land) + " ] ããããªï¼\n" - +"Webãã©ã¦ã¶ã«ããIDç»é²æç¶ãã¯æ¬å½ã«å®äºãã¦ãããªï¼\n" - +"Webãã©ã¦ã¶ã§ããã°ã¤ã³ã§ããªããè©¦ãã¦ã¿ã¦ï¼\n" - +"â¦ã¦ã¼ã¶åããã¹ã¯ã¼ãã«ããç¨®ã®ç¹æ®æåãä½¿ã£ã¦ããäººã¯" - +"åé¡ãããããã"; - - JOptionPane pane = new JOptionPane(message, - JOptionPane.WARNING_MESSAGE, - JOptionPane.DEFAULT_OPTION ); - - String title = VerInfo.getFrameTitle("ãã°ã¤ã³èªè¨¼å¤±æ"); - JDialog dialog = pane.createDialog(this, title); - - dialog.pack(); - dialog.setVisible(true); - dialog.dispose(); - - return; - } - - /** - * å¥åãããã¢ã«ã¦ã³ãæå ±ãåºã«ç¾å¨é¸æä¸ã®å½ã¸ãã°ã¤ã³ããã - * @return ãã°ã¤ã³ã«æåããã°trueãè¿ãã - */ - protected boolean login(){ - Land land = getSelectedLand(); - ServerAccess server = land.getServerAccess(); - - String id = this.idField.getText(); - char[] password = this.pwField.getPassword(); - this.landUserIDMap.put(land, id); - this.landPasswordMap.put(land, password); - - boolean result = false; - try{ - result = server.login(id, password); - }catch(IOException e){ - showNetworkError(e); - return false; - } - - if( ! result ){ - showIllegalAccountDialog(); - } - - return result; - } - - /** - * ç¾å¨é¸æä¸ã®å½ãããã°ã¢ã¦ãããã - */ - protected void logout(){ - try{ - logoutInternal(); - }catch(IOException e){ - showNetworkError(e); - } - return; - } - - /** - * ç¾å¨é¸æä¸ã®å½ãããã°ã¢ã¦ãããã - * @throws java.io.IOException ãããã¯ã¼ã¯ã¨ã©ã¼ - */ - protected void logoutInternal() throws IOException{ - Land land = getSelectedLand(); - ServerAccess server = land.getServerAccess(); - server.logout(); - return; - } - - /** - * ç¾å¨é¸æä¸ã®å½ã®ãã°ã¤ã³ç¶æã«åããã¦GUIãæ´æ°ããã - */ - private void updateGUI(){ - Land land = getSelectedLand(); - if(land == null) return; - - LandState state = land.getLandDef().getLandState(); - ServerAccess server = land.getServerAccess(); - boolean hasLoggedIn = server.hasLoggedIn(); - - if(state != LandState.ACTIVE){ - this.status.setText( - "ãã®å½ã¯æ¢ã«åéãåæ¢ãã¾ããã\n" - +"ãã°ã¤ã³ã¯ç¡æå³ã§ã" ); - this.idField.setEnabled(false); - this.pwField.setEnabled(false); - this.loginButton.setEnabled(false); - this.logoutButton.setEnabled(false); - }else if(hasLoggedIn){ - this.status.setText("ã¦ã¼ã¶ [ " + getUserID(land) + " ] ã¨ãã¦\n" - +"ç¾å¨ãã°ã¤ã³ä¸ã§ã"); - this.idField.setEnabled(false); - this.pwField.setEnabled(false); - this.loginButton.setEnabled(false); - this.logoutButton.setEnabled(true); - }else{ - this.status.setText("ç¾å¨ãã°ã¤ã³ãã¦ãã¾ãã"); - this.idField.setEnabled(true); - this.pwField.setEnabled(true); - this.loginButton.setEnabled(true); - this.logoutButton.setEnabled(false); - } - - return; - } - - /** - * å½æå ±ãè¨å®ããã - * @param model å½æå ± - * @throws NullPointerException å¼æ°ãnull - */ - public void setModel(LandsModel model) throws NullPointerException{ - if(model == null) throw new NullPointerException(); - - this.landUserIDMap.clear(); - this.landPasswordMap.clear(); - this.landBox.removeAllItems(); - - for(Land land : model.getLandList()){ - String userID = ""; - char[] password = {}; - this.landUserIDMap.put(land, userID); - this.landPasswordMap.put(land, password); - this.landBox.addItem(land); - } - - preSelectActiveLand(); - updateGUI(); - - return; - } - - /** - * {@inheritDoc} - * ãã¿ã³æä½ã®ãªã¹ãã - * @param event ã¤ãã³ã {@inheritDoc} - */ - // TODO Return ãã¼æ¼ä¸ã«ãããã°ã¤ã³ããµãã¼ãããã - @Override - public void actionPerformed(ActionEvent event){ - Object source = event.getSource(); - - if(source == this.closeButton){ - setVisible(false); - dispose(); - return; - } - - if(source == this.loginButton){ - login(); - }else if(source == this.logoutButton){ - logout(); - } - - updateGUI(); - - return; - } - - /** - * {@inheritDoc} - * ã³ã³ãããã¯ã¹æä½ã®ãªã¹ãã - * @param event ã¤ãã³ã {@inheritDoc} - */ - @Override - public void itemStateChanged(ItemEvent event){ - Object source = event.getSource(); - if(source != this.landBox) return; - - Land land = (Land) event.getItem(); - String id; - char[] password; - - switch(event.getStateChange()){ - case ItemEvent.SELECTED: - id = getUserID(land); - password = getPassword(land); - this.idField.setText(id); - this.pwField.setText(new String(password)); - updateGUI(); - break; - case ItemEvent.DESELECTED: - id = this.idField.getText(); - password = this.pwField.getPassword(); - this.landUserIDMap.put(land, id); - this.landPasswordMap.put(land, password); - break; - default: - assert false; - return; - } - - return; - } - - // TODO IDããã¹ã¯ã¼ããç©ºã®å ´åã¯ãã°ã¤ã³ãã¿ã³ãç¡å¹ã«ããã -} diff --git a/src/main/java/jp/sfjp/jindolf/view/ActionManager.java b/src/main/java/jp/sfjp/jindolf/view/ActionManager.java index 10c5abe..711275f 100644 --- a/src/main/java/jp/sfjp/jindolf/view/ActionManager.java +++ b/src/main/java/jp/sfjp/jindolf/view/ActionManager.java @@ -10,10 +10,11 @@ package jp.sfjp.jindolf.view; import java.awt.Insets; import java.awt.event.ActionListener; import java.awt.event.KeyEvent; +import java.util.ArrayList; import java.util.HashMap; -import java.util.HashSet; +import java.util.List; import java.util.Map; -import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; import javax.swing.AbstractButton; import javax.swing.ButtonGroup; import javax.swing.ButtonModel; @@ -32,13 +33,17 @@ import jp.sfjp.jindolf.VerInfo; import jp.sfjp.jindolf.util.GUIUtils; /** - * ã¡ãã¥ã¼ããã¿ã³ããã®ä»åç¨®Actionãä¼´ãã¤ãã³ããçæãã + * ã¡ãã¥ã¼ããã¿ã³ããã®ä»åç¨®Actionãä¼´ãã¤ãã³ããçºç«ãã * ã³ã³ãã¼ãã³ãã®ä¸æ¬ç®¡çã + * + *

ã¡ãã¥ã¼ãã¼ããã¼ã«ãã¼ãæä¾ããã + * + *

ã¢ããªã®ç¶æ³ã«å¿ãã¦ã¡ãã¥ã¼ããã¿ã³ã®ä¸é¨ã®æä½ããã¹ã¯ããã */ public class ActionManager{ /** ã¢ã¯ã·ã§ã³{@value}ã */ - public static final String CMD_ACCOUNT = "ACCOUNT"; + public static final String CMD_OPENXML = "OPENXML"; /** ã¢ã¯ã·ã§ã³{@value}ã */ public static final String CMD_EXIT = "EXIT"; /** ã¢ã¯ã·ã§ã³{@value}ã */ @@ -74,8 +79,6 @@ public class ActionManager{ /** ã¢ã¯ã·ã§ã³{@value}ã */ public static final String CMD_SHOWFILT = "SHOWFILT"; /** ã¢ã¯ã·ã§ã³{@value}ã */ - public static final String CMD_SHOWEDIT = "SHOWEDIT"; - /** ã¢ã¯ã·ã§ã³{@value}ã */ public static final String CMD_SHOWLOG = "SHOWLOG"; /** ã¢ã¯ã·ã§ã³{@value}ã */ public static final String CMD_HELPDOC = "HELPDOC"; @@ -98,7 +101,7 @@ public class ActionManager{ public static final String CMD_FONTSIZESEL = "FONTSIZESEL"; /** WWWã¢ã¤ã³ã³ã */ - public static final Icon ICON_WWW = GUIUtils.getWWWIcon(); + public static final Icon ICON_WWW; /** æ¤ç´¢ã¢ã¤ã³ã³ã */ public static final Icon ICON_FIND; /** åæ¤ç´¢ã¢ã¤ã³ã³ã */ @@ -112,36 +115,30 @@ public class ActionManager{ /** çºè¨ã¨ãã£ã¿ã¢ã¤ã³ã³ã */ public static final Icon ICON_EDITOR; - private static final KeyStroke KEY_F1 = KeyStroke.getKeyStroke("F1"); - private static final KeyStroke KEY_F3 = KeyStroke.getKeyStroke("F3"); - private static final KeyStroke KEY_SHIFT_F3 = - KeyStroke.getKeyStroke("shift F3"); - private static final KeyStroke KEY_F5 = KeyStroke.getKeyStroke("F5"); - private static final KeyStroke KEY_CTRL_F = - KeyStroke.getKeyStroke("ctrl F"); + private static final KeyStroke KEY_F1; + private static final KeyStroke KEY_F3; + private static final KeyStroke KEY_SHIFT_F3; + private static final KeyStroke KEY_F5; + private static final KeyStroke KEY_CTRL_F; static{ - ICON_FIND = - ResourceManager.getButtonIcon("resources/image/tb_find.png"); - - ICON_SEARCH_PREV = - ResourceManager.getButtonIcon("resources/image/tb_findprev.png"); - - ICON_SEARCH_NEXT = - ResourceManager.getButtonIcon("resources/image/tb_findnext.png"); - - ICON_RELOAD = - ResourceManager.getButtonIcon("resources/image/tb_reload.png"); - - ICON_FILTER = - ResourceManager.getButtonIcon("resources/image/tb_filter.png"); - - ICON_EDITOR = - ResourceManager.getButtonIcon("resources/image/tb_editor.png"); + ICON_WWW = GUIUtils.getWWWIcon(); + ICON_FIND = loadIcon("resources/image/tb_find.png"); + ICON_SEARCH_PREV = loadIcon("resources/image/tb_findprev.png"); + ICON_SEARCH_NEXT = loadIcon("resources/image/tb_findnext.png"); + ICON_RELOAD = loadIcon("resources/image/tb_reload.png"); + ICON_FILTER = loadIcon("resources/image/tb_filter.png"); + ICON_EDITOR = loadIcon("resources/image/tb_editor.png"); + + KEY_F1 = KeyStroke.getKeyStroke("F1"); + KEY_F3 = KeyStroke.getKeyStroke("F3"); + KEY_SHIFT_F3 = KeyStroke.getKeyStroke("shift F3"); + KEY_F5 = KeyStroke.getKeyStroke("F5"); + KEY_CTRL_F = KeyStroke.getKeyStroke("ctrl F"); } - private final Set actionItems = - new HashSet<>(); + + private final List actionItems = new ArrayList<>(100); private final Map namedMenuItems = new HashMap<>(); private final Map namedToolButtons = @@ -160,15 +157,18 @@ public class ActionManager{ private final JMenu menuLook; private final ButtonGroup landfGroup = new ButtonGroup(); private final Map landfMap = - new HashMap<>(); + new ConcurrentHashMap<>(); private final JToolBar browseToolBar; + /** * ã³ã³ã¹ãã©ã¯ã¿ã */ public ActionManager(){ - this.menuFile = buildMenu("Jindolf", KeyEvent.VK_F); + super(); + + this.menuFile = buildMenu("ãã¡ã¤ã«", KeyEvent.VK_F); this.menuEdit = buildMenu("ç·¨é", KeyEvent.VK_E); this.menuVillage = buildMenu("æ", KeyEvent.VK_V); this.menuDay = buildMenu("æ¥", KeyEvent.VK_D); @@ -178,7 +178,40 @@ public class ActionManager{ this.menuLook = buildLookAndFeelMenu("ã«ãã¯&ãã£ã¼ã«", KeyEvent.VK_L); - buildMenuItem(CMD_ACCOUNT, "ã¢ã«ã¦ã³ãç®¡ç", KeyEvent.VK_M); + setupMenuItems(); + setupToolButtons(); + setupMenuItemIcons(); + + registKeyAccelerator(); + + this.menuBar = buildMenuBar(); + this.browseToolBar = buildBrowseToolBar(); + + exposeVillageImpl(false); + exposeVillageLocalImpl(false); + exposePeriodImpl(false); + + return; + } + + + /** + * load icon from resource. + * + * @param resPath resource path name + * @return icon + */ + private static Icon loadIcon(String resPath){ + Icon result = ResourceManager.getButtonIcon(resPath); + return result; + } + + + /** + * setup menu items. + */ + private void setupMenuItems(){ + buildMenuItem(CMD_OPENXML, "ã¢ã¼ã«ã¤ãXMLãéã...", KeyEvent.VK_O); buildMenuItem(CMD_EXIT, "çµäº", KeyEvent.VK_X); buildMenuItem(CMD_COPY, "é¸æç¯å²ãã³ãã¼", KeyEvent.VK_C); buildMenuItem(CMD_SHOWFIND, "æ¤ç´¢...", KeyEvent.VK_F); @@ -196,19 +229,29 @@ public class ActionManager{ buildMenuItem(CMD_WEBDAY, "ãã®æ¥ããã©ã¦ã¶ã§è¡¨ç¤º...", KeyEvent.VK_B); buildMenuItem(CMD_OPTION, "ãªãã·ã§ã³...", KeyEvent.VK_O); buildMenuItem(CMD_SHOWFILT, "çºè¨ãã£ã«ã¿", KeyEvent.VK_F); - buildMenuItem(CMD_SHOWEDIT, "çºè¨ã¨ãã£ã¿", KeyEvent.VK_E); buildMenuItem(CMD_SHOWLOG, "ãã°è¡¨ç¤º", KeyEvent.VK_S); buildMenuItem(CMD_HELPDOC, "ãã«ãè¡¨ç¤º", KeyEvent.VK_H); buildMenuItem(CMD_SHOWPORTAL, "ãã¼ã¿ã«ãµã¤ã...", KeyEvent.VK_P); buildMenuItem(CMD_ABOUT, VerInfo.TITLE + "ã«ã¤ãã¦...", KeyEvent.VK_A); + return; + } + /** + * setup toolbuttons. + */ + private void setupToolButtons(){ buildToolButton(CMD_RELOAD, "é¸æä¸ã®æ¥ãå¼·å¶ãªãã¼ã", ICON_RELOAD); buildToolButton(CMD_SHOWFIND, "æ¤ç´¢", ICON_FIND); buildToolButton(CMD_SEARCHPREV, "âååè£", ICON_SEARCH_PREV); buildToolButton(CMD_SEARCHNEXT, "âæ¬¡åè£", ICON_SEARCH_NEXT); buildToolButton(CMD_SHOWFILT, "çºè¨ãã£ã«ã¿", ICON_FILTER); - buildToolButton(CMD_SHOWEDIT, "çºè¨ã¨ãã£ã¿", ICON_EDITOR); + return; + } + /** + * setup menu item icons. + */ + private void setupMenuItemIcons(){ getMenuItem(CMD_SHOWPORTAL).setIcon(ICON_WWW); getMenuItem(CMD_WEBVILL) .setIcon(ICON_WWW); getMenuItem(CMD_WEBWIKI) .setIcon(ICON_WWW); @@ -217,21 +260,12 @@ public class ActionManager{ getMenuItem(CMD_SEARCHPREV).setIcon(ICON_SEARCH_PREV); getMenuItem(CMD_SEARCHNEXT).setIcon(ICON_SEARCH_NEXT); getMenuItem(CMD_SHOWFILT) .setIcon(ICON_FILTER); - getMenuItem(CMD_SHOWEDIT) .setIcon(ICON_EDITOR); - - registKeyAccelerator(); - - this.menuBar = buildMenuBar(); - this.browseToolBar = buildBrowseToolBar(); - - appearVillageImpl(false); - appearPeriodImpl(false); - return; } /** * ã¡ãã¥ã¼ãçæããã + * * @param label ã¡ãã¥ã¼ã©ãã« * @param nemonic ãã¢ããã¯ãã¼ * @return ã¡ãã¥ã¼ @@ -249,14 +283,15 @@ public class ActionManager{ /** * ã¡ãã¥ã¼ã¢ã¤ãã ãçæããã + * * @param command ã¢ã¯ã·ã§ã³ã³ãã³ãå * @param label ã¡ãã¥ã¼ã©ãã« * @param nemonic ãã¢ããã¯ãã¼ * @return ã¡ãã¥ã¼ã¢ã¤ãã */ private JMenuItem buildMenuItem(String command, - String label, - int nemonic ){ + String label, + int nemonic ){ JMenuItem result = new JMenuItem(); String keyText = label + "(" + KeyEvent.getKeyText(nemonic) + ")"; @@ -273,20 +308,21 @@ public class ActionManager{ /** * ãã¼ã«ãã¿ã³ãçæããã + * * @param command ã¢ã¯ã·ã§ã³ã³ãã³ãå * @param tooltip ãã¼ã«ãããæåå * @param icon ã¢ã¤ã³ã³ç»å * @return ãã¼ã«ãã¿ã³ */ private JButton buildToolButton(String command, - String tooltip, - Icon icon){ + String tooltip, + Icon icon){ JButton result = new JButton(); - result.setIcon(icon); + result.setActionCommand(command); result.setToolTipText(tooltip); + result.setIcon(icon); result.setMargin(new Insets(1, 1, 1, 1)); - result.setActionCommand(command); this.actionItems.add(result); this.namedToolButtons.put(command, result); @@ -295,10 +331,11 @@ public class ActionManager{ } /** - * L&F ä¸è¦§ã¡ãã¥ã¼ãä½æããã + * L&F ä¸è¦§ã¡ãã¥ã¼ãä½æããã + * * @param label ã¡ãã¥ã¼ã©ãã« * @param nemonic ãã¢ããã¯ãã¼ - * @return L&F ä¸è¦§ã¡ãã¥ã¼ + * @return L&F ä¸è¦§ã¡ãã¥ã¼ */ private JMenu buildLookAndFeelMenu(String label, int nemonic){ JMenu result = buildMenu(label, nemonic); @@ -344,6 +381,7 @@ public class ActionManager{ /** * ã¢ã¯ã·ã§ã³ã³ãã³ãåããã¡ãã¥ã¼ã¢ã¤ãã ãæ¢ãã + * * @param command ã¢ã¯ã·ã§ã³ã³ãã³ãå * @return ã¡ãã¥ã¼ã¢ã¤ãã */ @@ -354,6 +392,7 @@ public class ActionManager{ /** * ã¢ã¯ã·ã§ã³ã³ãã³ãåãããã¼ã«ãã¿ã³ãæ¢ãã + * * @param command ã¢ã¯ã·ã§ã³ã³ãã³ãå * @return ãã¼ã«ãã¿ã³ */ @@ -363,7 +402,8 @@ public class ActionManager{ } /** - * ç¾å¨ã¡ãã¥ã¼ã§é¸æä¸ã®L&Fã®ã¯ã©ã¹åãè¿ãã + * ç¾å¨LookAndFeelã¡ãã¥ã¼ã§é¸æä¸ã®L&Fã®ã¯ã©ã¹åãè¿ãã + * * @return L&F ã¯ã©ã¹å */ public String getSelectedLookAndFeel(){ @@ -374,22 +414,24 @@ public class ActionManager{ } /** - * å¨ã¦ã®ãã¿ã³ã«ã¢ã¯ã·ã§ã³ãªã¹ãã¼ãç»é²ããã + * ç®¡çä¸ã®å¨ã¦ã®ãã¿ã³ã«ã¢ã¯ã·ã§ã³ãªã¹ãã¼ãç»é²ããã + * * @param listener ã¢ã¯ã·ã§ã³ãªã¹ãã¼ */ public void addActionListener(ActionListener listener){ - for(AbstractButton button : this.actionItems){ + this.actionItems.forEach(button -> { button.addActionListener(listener); - } + }); return; } /** * ã¡ãã¥ã¼ãã¼ãçæããã + * * @return ã¡ãã¥ã¼ãã¼ */ private JMenuBar buildMenuBar(){ - this.menuFile.add(getMenuItem(CMD_ACCOUNT)); + this.menuFile.add(getMenuItem(CMD_OPENXML)); this.menuFile.addSeparator(); this.menuFile.add(getMenuItem(CMD_EXIT)); @@ -416,7 +458,6 @@ public class ActionManager{ this.menuPreference.add(this.menuLook); this.menuTool.add(getMenuItem(CMD_SHOWFILT)); - this.menuTool.add(getMenuItem(CMD_SHOWEDIT)); this.menuTool.add(getMenuItem(CMD_SHOWLOG)); this.menuHelp.add(getMenuItem(CMD_HELPDOC)); @@ -439,6 +480,7 @@ public class ActionManager{ /** * ã¡ãã¥ã¼ãã¼ãåå¾ããã + * * @return ã¡ãã¥ã¼ãã¼ */ public JMenuBar getMenuBar(){ @@ -447,6 +489,7 @@ public class ActionManager{ /** * ãã©ã¦ã¶ç¨ãã¼ã«ãã¼ã®çæãè¡ãã + * * @return ãã¼ã«ãã¼ */ private JToolBar buildBrowseToolBar(){ @@ -459,13 +502,13 @@ public class ActionManager{ toolBar.add(getToolButton(CMD_SEARCHPREV)); toolBar.addSeparator(); toolBar.add(getToolButton(CMD_SHOWFILT)); - toolBar.add(getToolButton(CMD_SHOWEDIT)); return toolBar; } /** * ãã©ã¦ã¶ç¨ãã¼ã«ãã¼ãåå¾ããã + * * @return ãã¼ã«ãã¼ */ public JToolBar getBrowseToolBar(){ @@ -473,12 +516,11 @@ public class ActionManager{ } /** - * Periodãè¡¨ç¤ºããã¦ãããéç¥ãåããã - * @param appear è¡¨ç¤ºããã¦ããã¨ãã¯true + * Periodã®é¸æè¡¨ç¤ºç¶æ³ã«å¿ãã¦UIããã¹ã¯ããã + * + * @param appear Periodã¿ããé¸æããã¦ããã¨ãã¯true */ - private void appearPeriodImpl(boolean appear){ - if(appear) appearVillageImpl(appear); - + private void exposePeriodImpl(boolean appear){ this.menuEdit.setEnabled(appear); this.menuDay .setEnabled(appear); @@ -491,32 +533,68 @@ public class ActionManager{ } /** - * Periodãè¡¨ç¤ºããã¦ãããéç¥ãåããã - * @param appear è¡¨ç¤ºããã¦ããã¨ãã¯true + * Periodã®é¸æè¡¨ç¤ºç¶æ³ã«å¿ãã¦UIããã¹ã¯ããã + * + * @param appear Periodã¿ããé¸æããã¦ããã¨ãã¯true + */ + public void exposePeriod(boolean appear){ + exposePeriodImpl(appear); + return; + } + + /** + * æããªã¼ã®é¸æè¡¨ç¤ºç¶æ³ã«å¿ãã¦UIããã¹ã¯ããã + * + * @param appear æãã¼ããé¸æããã¦ããã¨ãã¯true */ - public void appearPeriod(boolean appear){ - appearPeriodImpl(appear); + private void exposeVillageImpl(boolean appear){ + this.menuVillage.setEnabled(appear); + + getMenuItem(CMD_RELOAD) .setEnabled(appear); + getMenuItem(CMD_ALLPERIOD) .setEnabled(appear); + + getToolButton(CMD_RELOAD) .setEnabled(appear); + return; } /** - * æãè¡¨ç¤ºããã¦ãããéç¥ãåããã - * @param appear è¡¨ç¤ºããã¦ããã¨ãã¯true + * æããªã¼ã®é¸æè¡¨ç¤ºç¶æ³ã«å¿ãã¦UIããã¹ã¯ããã + * + * @param appear æãã¼ããé¸æããã¦ããã¨ãã¯true */ - private void appearVillageImpl(boolean appear){ - if( ! appear) appearPeriodImpl(appear); + public void exposeVillage(boolean appear){ + exposeVillageImpl(appear); + return; + } + /** + * ãã¼ã«ã«XMLæã®è¡¨ç¤ºç¶æ³ã«å¿ãã¦UIããã¹ã¯ããã + * + *

åä¸ããã³å¨æ¥ç¨Periodã®å¼·å¶èªã¿è¾¼ã¿ãææ¢ãããã + * + * @param appear ãã¼ã«ã«XMLãè¡¨ç¤ºããã¦ããã¨ãã¯true + */ + private void exposeVillageLocalImpl(boolean appear){ this.menuVillage.setEnabled(appear); + getMenuItem(CMD_RELOAD) .setEnabled( ! appear); + getMenuItem(CMD_ALLPERIOD) .setEnabled( ! appear); + + getToolButton(CMD_RELOAD) .setEnabled( ! appear); + return; } /** - * æãè¡¨ç¤ºããã¦ãããéç¥ãåããã - * @param appear è¡¨ç¤ºããã¦ããã¨ãã¯true + * ãã¼ã«ã«XMLæã®è¡¨ç¤ºç¶æ³ã«å¿ãã¦UIããã¹ã¯ããã + * + *

åä¸ããã³å¨æ¥ç¨Periodã®å¼·å¶èªã¿è¾¼ã¿ãææ¢ãããã + * + * @param appear ãã¼ã«ã«XMLãè¡¨ç¤ºããã¦ããã¨ãã¯true */ - public void appearVillage(boolean appear){ - appearVillageImpl(appear); + public void exposeVillageLocal(boolean appear){ + exposeVillageLocalImpl(appear); return; } diff --git a/src/main/java/jp/sfjp/jindolf/view/AvatarPics.java b/src/main/java/jp/sfjp/jindolf/view/AvatarPics.java new file mode 100644 index 0000000..00c97d9 --- /dev/null +++ b/src/main/java/jp/sfjp/jindolf/view/AvatarPics.java @@ -0,0 +1,243 @@ +/* + * Avatar image loader + * + * License : The MIT License + * Copyright(c) 2020 olyutorskii + */ + +package jp.sfjp.jindolf.view; + +import java.awt.image.BufferedImage; +import java.text.MessageFormat; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; +import jp.sfjp.jindolf.data.Avatar; +import jp.sfjp.jindolf.data.Land; +import jp.sfjp.jindolf.util.GUIUtils; +import jp.sourceforge.jindolf.corelib.LandDef; + +/** + * Avatarã®é¡ãå¨èº«åãéºå½±ãå¢ã®ç»åããã£ãã·ã¥ç®¡çããã + */ +public class AvatarPics { + + private final Land land; + + private final Map faceImageMap; + private final Map bodyImageMap; + private final Map faceMonoImageMap; + private final Map bodyMonoImageMap; + + private BufferedImage graveImage; + private BufferedImage graveBodyImage; + + + /** + * Constructor. + * + * @param land å½ + */ + public AvatarPics(Land land){ + super(); + + Objects.nonNull(land); + this.land = land; + + this.faceImageMap = new HashMap<>(); + this.bodyImageMap = new HashMap<>(); + this.faceMonoImageMap = new HashMap<>(); + this.bodyMonoImageMap = new HashMap<>(); + + this.graveImage = null; + this.graveBodyImage = null; + + return; + } + + + /** + * Avatarã®é¡ã¤ã¡ã¼ã¸ãè¿ãã + * + * @param avatar Avatar + * @return é¡ã¤ã¡ã¼ã¸ + */ + public BufferedImage getAvatarFaceImage(Avatar avatar){ + BufferedImage result; + result = this.faceImageMap.get(avatar); + if(result != null) return result; + + LandDef landDef = this.land.getLandDef(); + + String template = landDef.getFaceURITemplate(); + int serialNo = avatar.getIdNum(); + result = loadAvatarImage(template, serialNo); + + this.faceImageMap.put(avatar, result); + + return result; + } + + /** + * Avatarã®é¡ã¤ã¡ã¼ã¸ãè¨å®ããã + * + * @param avatar Avatar + * @param image ã¤ã¡ã¼ã¸ + */ + public void setAvatarFaceImage(Avatar avatar, BufferedImage image){ + this.faceImageMap.remove(avatar); + this.faceMonoImageMap.remove(avatar); + this.faceImageMap.put(avatar, image); + return; + } + + /** + * Avatarã®å¨èº«åã¤ã¡ã¼ã¸ãè¿ãã + * + * @param avatar Avatar + * @return å¨èº«ã¤ã¡ã¼ã¸ + */ + public BufferedImage getAvatarBodyImage(Avatar avatar){ + BufferedImage result; + result = this.bodyImageMap.get(avatar); + if(result != null) return result; + + LandDef landDef = this.land.getLandDef(); + + String template = landDef.getBodyURITemplate(); + int serialNo = avatar.getIdNum(); + result = loadAvatarImage(template, serialNo); + + this.bodyImageMap.put(avatar, result); + + return result; + } + + /** + * Avatarã®å¨èº«åã¤ã¡ã¼ã¸ãè¨å®ããã + * + * @param avatar Avatar + * @param image ã¤ã¡ã¼ã¸ + */ + public void setAvatarBodyImage(Avatar avatar, BufferedImage image){ + this.bodyImageMap.remove(avatar); + this.bodyMonoImageMap.remove(avatar); + this.bodyImageMap.put(avatar, image); + return; + } + + /** + * åå½URLãã³ãã¬ã¼ãã¨éãçªå·ãã + * ã¤ã¡ã¼ã¸ããã¦ã³ãã¼ãããã + * + * @param template ãã³ãã¬ã¼ã + * @param serialNo Avatarã®éãçªå· + * @return é¡ãããã¯å¨èº«åã¤ã¡ã¼ã¸ + */ + private BufferedImage loadAvatarImage(String template, int serialNo){ + String uri = MessageFormat.format(template, serialNo); + + BufferedImage result; + result = this.land.downloadImage(uri); + if(result == null) result = GUIUtils.getNoImage(); + + return result; + } + + /** + * Avatarã®ã¢ãã¯ãé¡ã¤ã¡ã¼ã¸ãè¿ãã + * + * @param avatar Avatar + * @return é¡ã¤ã¡ã¼ã¸ + */ + public BufferedImage getAvatarFaceMonoImage(Avatar avatar){ + BufferedImage result; + result = this.faceMonoImageMap.get(avatar); + if(result == null){ + result = getAvatarFaceImage(avatar); + result = GUIUtils.createMonoImage(result); + this.faceMonoImageMap.put(avatar, result); + } + return result; + } + + /** + * Avatarã®å¨èº«åã¤ã¡ã¼ã¸ãè¿ãã + * + * @param avatar Avatar + * @return å¨èº«ã¤ã¡ã¼ã¸ + */ + public BufferedImage getAvatarBodyMonoImage(Avatar avatar){ + BufferedImage result; + result = this.bodyMonoImageMap.get(avatar); + if(result == null){ + result = getAvatarBodyImage(avatar); + result = GUIUtils.createMonoImage(result); + this.bodyMonoImageMap.put(avatar, result); + } + return result; + } + + /** + * å½å¥ã®å¢ã¤ã¡ã¼ã¸ãè¿ãã + * + * @return å¢ã¤ã¡ã¼ã¸ + */ + public BufferedImage getGraveImage(){ + if(this.graveImage != null) return this.graveImage; + + BufferedImage result = this.land.getGraveIconImage(); + this.graveImage = result; + + return result; + } + + /** + * å¢ã¤ã¡ã¼ã¸ãè¨å®ããã + * + * @param image ã¤ã¡ã¼ã¸ + */ + public void setGraveImage(BufferedImage image){ + this.graveImage = image; + return; + } + + /** + * å½å¥ã®å¢ã¤ã¡ã¼ã¸(å¤§)ãè¿ãã + * + * @return å¢ã¤ã¡ã¼ã¸(å¤§) + */ + public BufferedImage getGraveBodyImage(){ + if(this.graveBodyImage != null) return this.graveBodyImage; + + BufferedImage result = this.land.getGraveBodyImage(); + this.graveBodyImage = result; + + return result; + } + + /** + * å¢ã¤ã¡ã¼ã¸(å¤§)ãè¨å®ããã + * + * @param image ã¤ã¡ã¼ã¸ + */ + public void setGraveBodyImage(BufferedImage image){ + this.graveBodyImage = image; + return; + } + + /** + * å¨ç»åã®ãã£ãã·ã¥ã¸ã®æ ¼ç´ãè©¦ã¿ãã + */ + public void preload(){ + for(Avatar avatar : Avatar.getPredefinedAvatarList()){ + getAvatarFaceImage(avatar); + getAvatarBodyImage(avatar); + getAvatarFaceMonoImage(avatar); + getAvatarBodyMonoImage(avatar); + getGraveImage(); + getGraveBodyImage(); + } + } + +} diff --git a/src/main/java/jp/sfjp/jindolf/view/HelpFrame.java b/src/main/java/jp/sfjp/jindolf/view/HelpFrame.java index 9162f5a..2100db2 100644 --- a/src/main/java/jp/sfjp/jindolf/view/HelpFrame.java +++ b/src/main/java/jp/sfjp/jindolf/view/HelpFrame.java @@ -172,7 +172,7 @@ public class HelpFrame extends JFrame if(configStore.useStoreFile()){ info.append("è¨å®æ ¼ç´ãã£ã¬ã¯ããª : ") - .append(configStore.getConfigPath().getPath()); + .append(configStore.getConfigDir().getPath()); }else{ info.append("â» è¨å®æ ¼ç´ãã£ã¬ã¯ããªã¯ä½¿ã£ã¦ãã¾ããã"); } diff --git a/src/main/java/jp/sfjp/jindolf/view/LandsTree.java b/src/main/java/jp/sfjp/jindolf/view/LandsTree.java index e663533..4f91e78 100644 --- a/src/main/java/jp/sfjp/jindolf/view/LandsTree.java +++ b/src/main/java/jp/sfjp/jindolf/view/LandsTree.java @@ -28,7 +28,7 @@ import javax.swing.tree.TreePath; import javax.swing.tree.TreeSelectionModel; import jp.sfjp.jindolf.ResourceManager; import jp.sfjp.jindolf.data.Land; -import jp.sfjp.jindolf.data.LandsModel; +import jp.sfjp.jindolf.data.LandsTreeModel; /** * å½ä¸è¦§Treeå¨è¾ºã³ã³ãã¼ãã³ãç¾¤ã @@ -151,13 +151,13 @@ public class LandsTree } /** - * ç®¡çä¸ã®LandsModelãè¿ãã - * @return LandsModel + * ç®¡çä¸ã®LandsTreeModelãè¿ãã + * @return LandsTreeModel */ - private LandsModel getLandsModel(){ + private LandsTreeModel getLandsModel(){ TreeModel model = this.treeView.getModel(); - if(model instanceof LandsModel){ - return (LandsModel) model; + if(model instanceof LandsTreeModel){ + return (LandsTreeModel) model; } return null; } @@ -179,7 +179,7 @@ public class LandsTree final TreePath lastPath = this.treeView.getSelectionPath(); - LandsModel model = getLandsModel(); + LandsTreeModel model = getLandsModel(); if(model != null){ model.setAscending(this.ascending); } diff --git a/src/main/java/jp/sfjp/jindolf/view/LocalAvatarImg.java b/src/main/java/jp/sfjp/jindolf/view/LocalAvatarImg.java new file mode 100644 index 0000000..481c9dc --- /dev/null +++ b/src/main/java/jp/sfjp/jindolf/view/LocalAvatarImg.java @@ -0,0 +1,126 @@ +/* + * local avatar images + * + * License : The MIT License + * Copyright(c) 2020 olyutorskii + */ + +package jp.sfjp.jindolf.view; + +import java.awt.image.BufferedImage; +import java.text.MessageFormat; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import jp.sfjp.jindolf.ResourceManager; +import jp.sfjp.jindolf.data.Avatar; + +/** + * äººç¼BBSãµã¼ãã«ã¢ã¯ã»ã¹ã§ããªããªãå°æ¥ã«åããä»£æ¿ã¤ã¡ã¼ã¸ã®è«¸ãã + * + *

2020-04ç¾å¨ãåªåºµæ°ä½ã®æ°æ§Avatarã¤ã¡ã¼ã¸ã¯ + * äººç¼BBSãµã¼ãç¾¤ããå¬è¡éä¿¡ä¸ã + * + * @see NINJINIX.COM + * @see è·¯å°è£è¬äº + */ +public final class LocalAvatarImg { + + private static final String IMGDIR = "resources/image/avatar"; + private static final String TEMPLATE_FACE = + IMGDIR + "/face{0,number,#00}.png"; + private static final String TEMPLATE_BODY = + IMGDIR + "/body{0,number,#00}.png"; + private static final String RES_GRAVE = IMGDIR + "/face99.png"; + private static final String RES_GRAVEBODY = IMGDIR + "/body99.png"; + + private static final Map FACE_MAP; + private static final Map BODY_MAP; + + private static final BufferedImage GRAVE_IMAGE; + private static final BufferedImage GRAVEBODY_IMAGE; + + static{ + FACE_MAP = loadTemplateResImg(TEMPLATE_FACE); + BODY_MAP = loadTemplateResImg(TEMPLATE_BODY); + + GRAVE_IMAGE = ResourceManager.getBufferedImage(RES_GRAVE); + GRAVEBODY_IMAGE = ResourceManager.getBufferedImage(RES_GRAVEBODY); + } + + + /** + * Hidden constructor. + */ + private LocalAvatarImg(){ + assert false; + } + + + /** + * ãªã½ã¼ã¹åãã³ãã¬ã¼ãã«AvatarIdNumãé©ç¨ãã¦å¾ããããªã½ã¼ã¹ãã + * ã¤ã¡ã¼ã¸ãèªã¿è¾¼ãã + * + * @param resForm ãªã½ã¼ã¹åãã³ãã¬ã¼ã + * @return AvatarIdã¨ãªã½ã¼ã¹ã¤ã¡ã¼ã¸ãããªãããã + */ + private static Map loadTemplateResImg(String resForm){ + Map result = new HashMap<>(); + + Avatar.getPredefinedAvatarList().forEach(avatar -> { + String avatarId = avatar.getIdentifier(); + int idNum = avatar.getIdNum(); + String res = MessageFormat.format(resForm, idNum); + + BufferedImage img = ResourceManager.getBufferedImage(res); + assert img != null; + result.put(avatarId, img); + }); + + return Collections.unmodifiableMap(result); + } + + + /** + * Avatarã®ä»£æ¿é¡ã¤ã¡ã¼ã¸ãè¿ãã + * + * @param avatarId AvatarId + * @return ä»£æ¿é¡ã¤ã¡ã¼ã¸ + */ + public static BufferedImage getAvatarFaceImage(String avatarId){ + BufferedImage result = FACE_MAP.get(avatarId); + return result; + } + + /** + * Avatarã®ä»£æ¿å¨èº«åã¤ã¡ã¼ã¸ãè¿ãã + * + * @param avatarId AvatarId + * @return ä»£æ¿å¨èº«åã¤ã¡ã¼ã¸ + */ + public static BufferedImage getAvatarBodyImage(String avatarId){ + BufferedImage result = BODY_MAP.get(avatarId); + return result; + } + + /** + * ä»£æ¿å¢ã¤ã¡ã¼ã¸ãè¿ãã + * + * @return ä»£æ¿å¢ã¤ã¡ã¼ã¸ + */ + public static BufferedImage getGraveImage(){ + return GRAVE_IMAGE; + } + + /** + * ä»£æ¿å¢ã¤ã¡ã¼ã¸(å¤§)ãè¿ãã + * + * @return ä»£æ¿å¢ã¤ã¡ã¼ã¸(å¤§) + */ + public static BufferedImage getGraveBodyImage(){ + return GRAVEBODY_IMAGE; + } + +} diff --git a/src/main/java/jp/sfjp/jindolf/view/PeriodView.java b/src/main/java/jp/sfjp/jindolf/view/PeriodView.java index fd44be2..2a04bf0 100644 --- a/src/main/java/jp/sfjp/jindolf/view/PeriodView.java +++ b/src/main/java/jp/sfjp/jindolf/view/PeriodView.java @@ -41,7 +41,17 @@ import jp.sfjp.jindolf.glyph.TalkDraw; import jp.sourceforge.jindolf.corelib.TalkType; /** - * çºè¨ãã©ã¦ã¶ãååããPeriodãã¥ã¼ã¯ã + * åPeriodã®ãã¥ã¼ã + * + *

Periodã®åå®¹ãåæ ãããã + * + *

ä¼è©±è¡¨ç¤º{@link Discussion}ã®ã¹ã¯ãã¼ã«å¶å¾¡ + * ãæå½ããã */ @SuppressWarnings("serial") public class PeriodView extends JPanel implements ItemListener{ @@ -50,6 +60,7 @@ public class PeriodView extends JPanel implements ItemListener{ private static final Color COLOR_NORMALBG = Color.BLACK; private static final Color COLOR_SIMPLEBG = Color.WHITE; + private Period period; private final Discussion discussion; @@ -62,8 +73,10 @@ public class PeriodView extends JPanel implements ItemListener{ private DialogPref dialogPref = new DialogPref(); + /** - * çºè¨ãã©ã¦ã¶ãååããPeriodãã¥ã¼ã¯ãçæããã + * ã³ã³ã¹ãã©ã¯ã¿ã + * * @param period æ¥ */ @SuppressWarnings("LeakingThisInConstructor") @@ -155,8 +168,10 @@ public class PeriodView extends JPanel implements ItemListener{ /** * Periodãæ´æ°ããã - * å¤ãPeriodã®è¡¨ç¤ºåå®¹ã¯æ¶ããã + * + *

å¤ãPeriodã®è¡¨ç¤ºåå®¹ã¯æ¶ããã * æ°ããPeriodã®è¡¨ç¤ºåå®¹ã¯ã¾ã åæ ãããªãã + * * @param period æ°ããPeriod */ public void setPeriod(Period period){ @@ -171,6 +186,7 @@ public class PeriodView extends JPanel implements ItemListener{ /** * ç¾å¨ã®Periodãè¿ãã + * * @return ç¾å¨ã®Period */ public Period getPeriod(){ @@ -178,7 +194,7 @@ public class PeriodView extends JPanel implements ItemListener{ } /** - * ä¸é¨ã®GUI(æåãçºè¨ä¸è¦§)ããPeriodã®ç¶æã«åããã¦æ´æ°ããã + * ä¸é¨ã®æåãä¼è©±ãã«ãã¦ã³ãªã¹ãããPeriodã®ç¶æã«åããã¦æ´æ°ããã */ private void updateTopPanel(){ if(this.period == null){ @@ -193,18 +209,8 @@ public class PeriodView extends JPanel implements ItemListener{ String dayCaption = this.period.getCaption(); String limitCaption = this.period.getLimit(); - String account = this.period.getLoginName(); - - String loginout; - if(this.period.isFullOpen()){ - loginout = ""; - }else if(account != null){ - loginout = " (ãã°ã¤ã³ä¸)"; - }else{ - loginout = " (ãã°ã¢ã¦ãä¸)"; - } - String info = villageName + "æ " + dayCaption + loginout; + String info = villageName + "æ " + dayCaption; this.caption.setText(info); this.limit.setText("æ´æ°æå» " + limitCaption); @@ -232,6 +238,7 @@ public class PeriodView extends JPanel implements ItemListener{ /** * ãã©ã³ãæç»è¨å®ãå¤æ´ããã + * * @param fontInfo ãã©ã³ãè¨å® */ // TODO ã¹ã¯ãã¼ã«ä½ç½®ã®å¾©å @@ -245,7 +252,8 @@ public class PeriodView extends JPanel implements ItemListener{ } /** - * çºè¨è¡¨ç¤ºè¨å®ãæ´æ°ããã + * ä¼è©±è¡¨ç¤ºè¨å®ãå¤æ´ããã + * * @param pref è¡¨ç¤ºè¨å® */ public void setDialogPref(DialogPref pref){ @@ -260,15 +268,17 @@ public class PeriodView extends JPanel implements ItemListener{ } /** - * ãã¥ã¼ãã¼ãåã®çºè¨ãã©ã¦ã¶ãè¿ãã - * @return åé¨ãã©ã¦ã¶ + * ãã¥ã¼ãã¼ãåã®ä¼è©±è¡¨ç¤º{@link Discussion}ãè¿ãã + * + * @return ä¼è©±è¡¨ç¤º */ public Discussion getDiscussion(){ return this.discussion; } /** - * ã¹ã¯ãã¼ã«ä½ç½®ãè¿ãã + * ç¸¦ã¹ã¯ãã¼ã«ä½ç½®ãè¿ãã + * * @return ã¹ã¯ãã¼ã«ä½ç½® */ public int getVerticalPosition(){ @@ -278,7 +288,8 @@ public class PeriodView extends JPanel implements ItemListener{ } /** - * ã¹ã¯ãã¼ã«ä½ç½®ãè¨å®ããã + * ç¸¦ã¹ã¯ãã¼ã«ä½ç½®ãè¨å®ããã + * * @param pos ã¹ã¯ãã¼ã«ä½ç½® */ public void setVerticalPosition(int pos){ @@ -289,7 +300,9 @@ public class PeriodView extends JPanel implements ItemListener{ /** * {@inheritDoc} - * ã³ã³ãããã¯ã¹æä½ã®ãªã¹ãã + * + *

ã³ã³ãããã¯ã¹æä½(ä¼è©±ãã«ãã¦ã³ãªã¹ã)ã®ãªã¹ãã + * * @param event ã³ã³ãããã¯ã¹æä½ã¤ãã³ã {@inheritDoc} */ @Override @@ -306,7 +319,8 @@ public class PeriodView extends JPanel implements ItemListener{ } /** - * ä»»æã®çºè¨ãè¡¨ç¤ºãããããã¹ã¯ãã¼ã«ããã + * ä»»æã®ä¼è©±ãè¡¨ç¤ºåã«åã¾ãããã¹ã¯ãã¼ã«ãè©¦ã¿ãã + * * @param talk çºè¨ */ public void scrollToTalk(Talk talk){ @@ -339,7 +353,9 @@ public class PeriodView extends JPanel implements ItemListener{ /** * {@inheritDoc} - * Talkã®ã¢ã³ã«ã¼è¡¨è¨ã¨çºè¨èåãæç»ããã + * + *

Talkã®ã¢ã³ã«ã¼è¡¨è¨ã¨çºè¨èåãæç»ããã + * * @param list {@inheritDoc} * @param value {@inheritDoc} * @param index {@inheritDoc} diff --git a/src/main/java/jp/sfjp/jindolf/view/TabBrowser.java b/src/main/java/jp/sfjp/jindolf/view/TabBrowser.java index cb7eafd..04aa1f7 100644 --- a/src/main/java/jp/sfjp/jindolf/view/TabBrowser.java +++ b/src/main/java/jp/sfjp/jindolf/view/TabBrowser.java @@ -9,16 +9,16 @@ package jp.sfjp.jindolf.view; import java.awt.Component; import java.awt.event.ActionListener; -import java.util.EventListener; -import java.util.LinkedList; +import java.util.ArrayList; import java.util.List; +import java.util.Objects; import javax.swing.BorderFactory; +import javax.swing.JComponent; import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JTabbedPane; import javax.swing.SwingConstants; import javax.swing.border.Border; -import javax.swing.event.EventListenerList; import jp.sfjp.jindolf.data.DialogPref; import jp.sfjp.jindolf.data.Period; import jp.sfjp.jindolf.data.Village; @@ -27,10 +27,19 @@ import jp.sfjp.jindolf.glyph.Discussion; import jp.sfjp.jindolf.glyph.FontInfo; /** - * ã¿ããç¨ãã¦ææå ±ã¨åPeriodãé²è¦§ããããã®ã³ã³ãã¼ãã³ãã + * ã¿ããç¨ãã¦ææå ±ã¨åPeriodãåãæ¿ãè¡¨ç¤ºããããã®ã³ã³ãã¼ãã³ãã + * + *

ææå ±ã¿ãã®ãã¥ã¼ã¯VillageInfoPanelã + * Periodã¿ãã®ãã¥ã¼ã¯PeriodViewãæå½ããã + * + *

PeriodViewã®æç»ä¸è«Discussionã¸ã®ã¢ã¯ã»ã¹ã + * ããã³ãã©ã³ãç®¡çãä¼è©±æç»è¨å®ãæä¾ããã */ @SuppressWarnings("serial") -public class TabBrowser extends JTabbedPane{ +public final class TabBrowser extends JTabbedPane{ + + private static final int PERIODTAB_OFFSET = 1; + private Village village; @@ -39,11 +48,11 @@ public class TabBrowser extends JTabbedPane{ private FontInfo fontInfo; private DialogPref dialogPref; - private final EventListenerList thisListenerList = - new EventListenerList(); /** - * æãæå®ããã¦ããªãç¶æã®ã¿ãããã«ãçæããã + * ã³ã³ã¹ãã©ã¯ã¿ã + * + *

æãæå®ããã¦ããªãç¶æã®ã¿ãããã«ãçæããã */ public TabBrowser(){ super(); @@ -52,35 +61,88 @@ public class TabBrowser extends JTabbedPane{ // Mac Aqua L&F ignore WRAP_TAB_LAYOUT setTabLayoutPolicy(JTabbedPane.WRAP_TAB_LAYOUT); + JComponent infoPane = decorateVillageInfo(); + addTab("ææå ±", infoPane); + + initTab(); + + return; + } + + + /** + * ææå ±è¡¨ç¤ºã³ã³ãã¼ãã³ããè£é£¾ããã + * + * @return è£é£¾æ¸ã¿ã³ã³ãã¼ãã³ã + */ + private JComponent decorateVillageInfo(){ Border border = BorderFactory.createEmptyBorder(5, 5, 5, 5); this.villageInfo.setBorder(border); + JScrollPane result = new JScrollPane(this.villageInfo); + return result; + } + + /** + * ã¿ãåæåã + * + *

Periodã¿ãã¯å¨ã¦æ¶ãææå ±ã¿ãã®ã¿ã«ãªãã + */ + private void initTab(){ + modifyTabCount(0); - addTab("ææå ±", new JScrollPane(this.villageInfo)); + updateVillageInfo(); + showVillageInfoTab(); - setVillage(null); + repaint(); + revalidate(); return; } /** - * ææå ±é²è¦§ç¨ã®ã³ã³ãã¼ãã³ããæ´æ°ããã + * æå®ããæ°ã®Periodãåã¾ãããå¿è¦ååãªã¿ãæ°ãç¨æããã + * + * @param periods Periodã®æ°(ã¨ããã¼ã°ãå«ã) */ - private void updateVillageInfo(){ - Village target = getVillage(); - this.villageInfo.updateVillage(target); + private void modifyTabCount(int periods){ + for(;;){ // çããã°ã¿ãè¿½å + int periodTabs = getTabCount() - PERIODTAB_OFFSET; + if(periods <= periodTabs) break; + String tabTitle = ""; + Component dummy = new JPanel(); + addTab(tabTitle, dummy); + } + + for(;;){ // é·ããã°ä½åãªã¿ãåé¤ + int periodTabs = getTabCount() - PERIODTAB_OFFSET; + if(periods >= periodTabs) break; + int lastTabIndex = getTabCount() - 1; + remove(lastTabIndex); + } + return; } /** - * ææå ±è¡¨ç¤ºã¿ããé¸æè¡¨ç¤ºããã + * Periodè¡¨ç¤ºããã¿ãå¨ã¦ã®ã³ã³ãã¼ãã³ãæ¬ä½ã¨ã¿ã¤ãã«ãåããã */ - private void selectVillageInfoTab(){ - setSelectedIndex(0); + private void fillPeriodTab(){ + this.village.getPeriodList().stream().forEachOrdered(period ->{ + PeriodView periodView = buildPeriodView(period); + String caption = period.getCaption(); + + int tabIndex = period.getDay() + PERIODTAB_OFFSET; + + setComponentAt(tabIndex, periodView); + setTitleAt(tabIndex, caption); + }); + return; } /** * è¨å®ãããæãè¿ãã + * * @return è¨å®ãããæ */ public Village getVillage(){ @@ -89,116 +151,88 @@ public class TabBrowser extends JTabbedPane{ /** * æ°è¦ã«æãè¨å®ããã + * + *

æã®Periodæ°ã«å¿ãã¦ã¿ãã®æ°ã¯å¤åããã + * * @param village æ°ããæ */ public final void setVillage(Village village){ - if(village == null){ - if(this.village != null){ - this.village.unloadPeriods(); - } - this.village = null; - selectVillageInfoTab(); - modifyTabCount(0); - updateVillageInfo(); + Village oldVillage = this.village; + if(oldVillage != null && village != oldVillage){ + oldVillage.unloadPeriods(); + } + + this.village = village; + if(this.village == null){ + initTab(); return; - }else if(village != this.village){ - selectVillageInfoTab(); } - if(this.village != null){ - this.village.unloadPeriods(); + if(this.village != oldVillage){ + showVillageInfoTab(); } - this.village = village; updateVillageInfo(); int periodNum = this.village.getPeriodSize(); modifyTabCount(periodNum); + fillPeriodTab(); - for(int periodDays = 0; periodDays < periodNum; periodDays++){ - Period period = this.village.getPeriod(periodDays); - int tabIndex = periodDaysToTabIndex(periodDays); - PeriodView periodView = getPeriodView(tabIndex); - if(periodView == null){ - periodView = new PeriodView(period); - periodView.setFontInfo(this.fontInfo); - periodView.setDialogPref(this.dialogPref); - setComponentAt(tabIndex, periodView); - Discussion discussion = periodView.getDiscussion(); - for(ActionListener listener : getActionListeners()){ - discussion.addActionListener(listener); - } - for(AnchorHitListener listener : getAnchorHitListeners()){ - discussion.addAnchorHitListener(listener); - } - } - String caption = period.getCaption(); - setTitleAt(tabIndex, caption); - if(period == periodView.getPeriod()) continue; - periodView.setPeriod(period); - } + repaint(); + revalidate(); return; } /** - * æå®ããæ°ã®Periodãåã¾ãããå¿è¦ååãªã¿ãæ°ãç¨æããã - * @param periods Periodã®æ° + * ææå ±é²è¦§ç¨ã®ã³ã³ãã¼ãã³ããæ´æ°ããã */ - private void modifyTabCount(int periods){ // TODO 0ã§ãå¤§ä¸å¤«? - int maxPeriodDays = periods - 1; - - for(;;){ // çããã°ã¿ãè¿½å - int maxTabIndex = getTabCount() - 1; - if(tabIndexToPeriodDays(maxTabIndex) >= maxPeriodDays) break; - String title = ""; - Component component = new JPanel(); - addTab(title, component); - } - - for(;;){ // é·ããã°ä½åãªã¿ãåé¤ - int maxTabIndex = getTabCount() - 1; - if(tabIndexToPeriodDays(maxTabIndex) <= maxPeriodDays) break; - remove(maxTabIndex); - } - + private void updateVillageInfo(){ + Village target = getVillage(); + this.villageInfo.updateVillage(target); return; } /** - * Periodæ¥ä»æå®ããã¿ãã¤ã³ããã¯ã¹å¤ã¸ã®å¤æã - * @param days Periodæ¥ä»æå® - * @return ã¿ãã¤ã³ããã¯ã¹ + * PeriodViewã¤ã³ã¹ã¿ã³ã¹ãçæããã + * + *

ãã©ã³ãè¨å®ãä¼è©±è¡¨ç¤ºè¨å®ãåç¨®ãªã¹ãã®è¨å®ãè¡ãããã + * + * @param period Period + * @return PeriodViewã¤ã³ã¹ã¿ã³ã¹ */ - public int periodDaysToTabIndex(int days){ - int tabIndex = days+1; - if(tabIndex >= getTabCount()) return -1; - return tabIndex; - } + private PeriodView buildPeriodView(Period period){ + Objects.nonNull(period); - /** - * ã¿ãã¤ã³ããã¯ã¹å¤ããPeriodæ¥ä»æå®ã¸ã®å¤æã - * @param tabIndex ã¿ãã¤ã³ããã¯ã¹ - * @return Periodæ¥ä»æå® - */ - private int tabIndexToPeriodDays(int tabIndex){ - if(tabIndex >= getTabCount()) return - 1; - int days = tabIndex - 1; - return days; + PeriodView result; + + result = new PeriodView(period); + result.setFontInfo(this.fontInfo); + result.setDialogPref(this.dialogPref); + + Discussion discussion = result.getDiscussion(); + for(ActionListener listener : getActionListeners()){ + discussion.addActionListener(listener); + } + for(AnchorHitListener listener : getAnchorHitListeners()){ + discussion.addAnchorHitListener(listener); + } + + return result; } /** * PeriodViewä¸è¦§ãå¾ãã + * * @return PeriodView ã® List */ public List getPeriodViewList(){ - List result = new LinkedList<>(); - int tabCount = getTabCount(); - for(int tabIndex = 0; tabIndex <= tabCount - 1; tabIndex++){ + int periodCount = tabCount - PERIODTAB_OFFSET; + List result = new ArrayList<>(periodCount); + + for(int tabIndex = PERIODTAB_OFFSET; tabIndex < tabCount; tabIndex++){ Component component = getComponent(tabIndex); - if(component == null) continue; - if( ! (component instanceof PeriodView) ) continue; PeriodView periodView = (PeriodView) component; result.add(periodView); } @@ -207,39 +241,20 @@ public class TabBrowser extends JTabbedPane{ } /** - * ç¾å¨ã¿ãé¸æä¸ã®Discussionãè¿ãã - * Periodã«é¢ä¿ãªãã¿ããé¸æããã¦ãããnullãè¿ãã - * @return ç¾å¨é¸æä¸ã®Discussion - */ - public Discussion currentDiscussion(){ - int tabIndex = getSelectedIndex(); - Discussion result = getDiscussion(tabIndex); - return result; - } - - /** - * ç¾å¨ã¿ãé¸æä¸ã®PeriodViewãè¿ãã - * Periodã«é¢ä¿ãªãã¿ããé¸æããã¦ãããnullãè¿ãã - * @return ç¾å¨é¸æä¸ã®PeriodView - */ - public PeriodView currentPeriodView(){ - int tabIndex = getSelectedIndex(); - PeriodView result = getPeriodView(tabIndex); - return result; - } - - /** - * æå®ããã¿ãã¤ã³ããã¯ã¹ã«é¢é£ä»ããããPeriodViewãè¿ãã - * Periodã«é¢ä¿ãªãã¿ããæå®ããããnullãè¿ãã - * @param tabIndex ã¿ãã¤ã³ããã¯ã¹ + * æå®ããPeriodæ¥ä»ã«é¢é£ä»ããããPeriodViewãè¿ãã + * + *

Periodã«é¢ä¿ãªãã¿ããæå®ããããnullãè¿ãã + * + * @param periodIndex Periodæ¥ä»ã¤ã³ããã¯ã¹ * @return æå®ãããPeriodView */ - public PeriodView getPeriodView(int tabIndex){ - if(tabIndexToPeriodDays(tabIndex) < 0) return null; - if(tabIndex >= getTabCount()) return null; - Component component = getComponentAt(tabIndex); - if(component == null) return null; + public PeriodView getPeriodView(int periodIndex){ + int tabIndex = periodIndex + PERIODTAB_OFFSET; + if(tabIndex < PERIODTAB_OFFSET || getTabCount() <= tabIndex){ + return null; + } + Component component = getComponentAt(tabIndex); if( ! (component instanceof PeriodView) ) return null; PeriodView periodView = (PeriodView) component; @@ -247,159 +262,162 @@ public class TabBrowser extends JTabbedPane{ } /** - * æå®ããã¿ãã¤ã³ããã¯ã¹ã«é¢é£ä»ããããDiscussionãè¿ãã - * Periodã«é¢ä¿ãªãã¿ããæå®ããããnullãè¿ãã - * @param tabIndex ã¿ãã¤ã³ããã¯ã¹ - * @return æå®ãããDiscussion + * ç¾å¨ã¿ãé¸æä¸ã®PeriodViewãè¿ãã + * + *

Periodã«é¢ä¿ãªãã¿ããé¸æããã¦ãããnullãè¿ãã + * + * @return ç¾å¨é¸æä¸ã®PeriodView */ - private Discussion getDiscussion(int tabIndex){ - PeriodView periodView = getPeriodView(tabIndex); - if(periodView == null) return null; - - Discussion result = periodView.getDiscussion(); + public PeriodView currentPeriodView(){ + int tabIndex = getSelectedIndex(); + int periodIndex = tabIndex - PERIODTAB_OFFSET; + PeriodView result = getPeriodView(periodIndex); return result; } /** * ãã©ã³ãæç»è¨å®ãå¤æ´ããã + * + *

è¨å®ã¯åPeriodViewã«å§è²ãããã + * * @param fontInfo ãã©ã³ã */ public void setFontInfo(FontInfo fontInfo){ + Objects.nonNull(fontInfo); this.fontInfo = fontInfo; - for(int tabIndex = 0; tabIndex <= getTabCount() - 1; tabIndex++){ - PeriodView periodView = getPeriodView(tabIndex); - if(periodView == null) continue; + getPeriodViewList().forEach(periodView -> { periodView.setFontInfo(this.fontInfo); - } + }); return; } /** * çºè¨è¡¨ç¤ºè¨å®ãå¤æ´ããã + * + *

è¨å®ã¯åPeriodViewã«å§è²ãããã + * * @param dialogPref çºè¨è¡¨ç¤ºè¨å® */ public void setDialogPref(DialogPref dialogPref){ + Objects.nonNull(dialogPref); this.dialogPref = dialogPref; - for(int tabIndex = 0; tabIndex <= getTabCount() - 1; tabIndex++){ - PeriodView periodView = getPeriodView(tabIndex); - if(periodView == null) continue; + getPeriodViewList().forEach(periodView -> { periodView.setDialogPref(this.dialogPref); - } + }); return; } /** + * ææå ±è¡¨ç¤ºã¿ããé¸æè¡¨ç¤ºããã + */ + private void showVillageInfoTab(){ + setSelectedIndex(0); + return; + } + + /** + * æå®ããæ¥ä»ã¤ã³ããã¯ã¹ã®Periodã®ã¿ããè¡¨ç¤ºããã + * + * @param periodIndex æ¥ä»ã¤ã³ããã¯ã¹ + */ + public void showPeriodTab(int periodIndex){ + int tabIndex = periodIndex + PERIODTAB_OFFSET; + setSelectedIndex(tabIndex); + return; + } + + /** * ActionListenerãè¿½å ããã + * + *

éä¸ã®Discussionã¸ããªã¹ãã¯ç»é²ãããã + * * @param listener ãªã¹ãã¼ */ public void addActionListener(ActionListener listener){ - this.thisListenerList.add(ActionListener.class, listener); + this.listenerList.add(ActionListener.class, listener); - if(this.village == null) return; - int periodNum = this.village.getPeriodSize(); - for(int periodDays = 0; periodDays < periodNum; periodDays++){ - int tabIndex = periodDaysToTabIndex(periodDays); - Discussion discussion = getDiscussion(tabIndex); - if(discussion == null) continue; - discussion.addActionListener(listener); - } + getPeriodViewList().stream() + .map(PeriodView::getDiscussion) + .forEach(discussion ->{ + discussion.addActionListener(listener); + }); return; } /** * ActionListenerãåé¤ããã + * * @param listener ãªã¹ãã¼ */ public void removeActionListener(ActionListener listener){ - this.thisListenerList.remove(ActionListener.class, listener); + this.listenerList.remove(ActionListener.class, listener); - if(this.village == null) return; - int periodNum = this.village.getPeriodSize(); - for(int periodDays = 0; periodDays < periodNum; periodDays++){ - int tabIndex = periodDaysToTabIndex(periodDays); - Discussion discussion = getDiscussion(tabIndex); - if(discussion == null) continue; - discussion.removeActionListener(listener); - } + getPeriodViewList().stream() + .map(PeriodView::getDiscussion) + .forEach(discussion ->{ + discussion.removeActionListener(listener); + }); return; } /** * ActionListenerãåæããã + * * @return ãã¹ã¦ã®ActionListener */ public ActionListener[] getActionListeners(){ - return this.thisListenerList.getListeners(ActionListener.class); + return getListeners(ActionListener.class); } /** * AnchorHitListenerãè¿½å ããã + * + *

éä¸ã®Discussionã¸ããªã¹ãã¯ç»é²ãããã + * * @param listener ãªã¹ãã¼ */ public void addAnchorHitListener(AnchorHitListener listener){ - this.thisListenerList.add(AnchorHitListener.class, listener); + this.listenerList.add(AnchorHitListener.class, listener); - if(this.village == null) return; - int periodNum = this.village.getPeriodSize(); - for(int periodDays = 0; periodDays < periodNum; periodDays++){ - int tabIndex = periodDaysToTabIndex(periodDays); - Discussion discussion = getDiscussion(tabIndex); - if(discussion == null) continue; - discussion.addAnchorHitListener(listener); - } + getPeriodViewList().stream() + .map(PeriodView::getDiscussion) + .forEach(discussion -> { + discussion.addAnchorHitListener(listener); + }); return; } /** * AnchorHitListenerãåé¤ããã + * * @param listener ãªã¹ãã¼ */ public void removeAnchorHitListener(AnchorHitListener listener){ - this.thisListenerList.remove(AnchorHitListener.class, listener); + this.listenerList.remove(AnchorHitListener.class, listener); - if(this.village == null) return; - int periodNum = this.village.getPeriodSize(); - for(int periodDays = 0; periodDays < periodNum; periodDays++){ - int tabIndex = periodDaysToTabIndex(periodDays); - Discussion discussion = getDiscussion(tabIndex); - if(discussion == null) continue; - discussion.removeAnchorHitListener(listener); - } + getPeriodViewList().stream() + .map(PeriodView::getDiscussion) + .forEach(discussion -> { + discussion.removeAnchorHitListener(listener); + }); return; } /** * AnchorHitListenerãåæããã + * * @return ãã¹ã¦ã®AnchorHitListener */ public AnchorHitListener[] getAnchorHitListeners(){ - return this.thisListenerList.getListeners(AnchorHitListener.class); - } - - /** - * {@inheritDoc} - * @param {@inheritDoc} - * @param listenerType {@inheritDoc} - * @return {@inheritDoc} - */ - @Override - public T[] getListeners(Class listenerType){ - T[] result; - result = this.thisListenerList.getListeners(listenerType); - - if(result.length <= 0){ - result = super.getListeners(listenerType); - } - - return result; + return getListeners(AnchorHitListener.class); } } diff --git a/src/main/java/jp/sfjp/jindolf/view/TopFrame.java b/src/main/java/jp/sfjp/jindolf/view/TopFrame.java index dc0b2aa..6b6d1c2 100644 --- a/src/main/java/jp/sfjp/jindolf/view/TopFrame.java +++ b/src/main/java/jp/sfjp/jindolf/view/TopFrame.java @@ -10,6 +10,7 @@ package jp.sfjp.jindolf.view; import java.awt.BorderLayout; import java.awt.Component; import java.awt.Container; +import java.awt.Cursor; import java.awt.LayoutManager; import java.awt.event.KeyAdapter; import java.awt.event.MouseAdapter; @@ -18,13 +19,30 @@ import javax.swing.JFrame; /** * ã¡ã¤ã³ã¢ããªã¦ã£ã³ãã¦ã - * {@link TopView}ãã¦ã£ã³ãã¦è¡¨ç¤ºããããã®ç®ã + * + *

ã¡ãã¥ã¼ãã¼ã¨{@link TopView}ãèªèº«ã®ã³ã³ããä¸ã«ã¬ã¤ã¢ã¦ãããã + * ã¢ããªç»é¢æ¬ä½ã®å¦çã¯{@link TopView}ã«å§è²ãããã + * + *

glass paneã®æä½ã«ããã + * ããã¼ãªå¦çä¸ã®åç¨®ã¢ããªæä½(ãã¼ãã¼ãããã¦ã¹)ããã¹ã¯ããã + * + *

ã¢ããªã«ããåã¦ã£ã³ãã¦ã®è¦ªåã³ç¥åã¨ãªãã + * + *

åç¨®ã¢ã¼ãã«ãã¤ã¢ãã°ã®è¦ªã¨ãªãã */ @SuppressWarnings("serial") public class TopFrame extends JFrame{ private final TopView topView = new TopView(); + /** * ã³ã³ã¹ãã©ã¯ã¿ã */ @@ -39,20 +57,26 @@ public class TopFrame extends JFrame{ return; } + /** * ã¬ã¤ã¢ã¦ãããã¶ã¤ã³ããã + * * @param container ã³ã³ãã */ private void design(Container container){ LayoutManager layout = new BorderLayout(); container.setLayout(layout); container.add(this.topView, BorderLayout.CENTER); - return; } /** * ã°ã©ã¹ãã¤ã³ã®ã«ã¹ã¿ãã¤ãºãè¡ãã + * + *

ãã®ã°ã©ã¹ãã¤ã³ã¯ãå¯è¦åããã¦ããéã + * ãã¼ãã¼ãå¥åã¨ãã¦ã¹å¥åãç¡è¦ããã */ private void modifyGrassPane(){ Component glassPane = new JComponent() {}; @@ -66,11 +90,66 @@ public class TopFrame extends JFrame{ } /** - * ããããã¥ã¼ãè¿ãã + * å®éã®ã¢ããªç»é¢ãæå½ãã{@link TopView}ãè¿ãã + * * @return ããããã¥ã¼ */ public TopView getTopView(){ return this.topView; } + /** + * ã¢ããªã¦ã£ã³ãã¦ä¸ã®ãã¦ã¹ã«ã¼ã½ã«ã®ãã¸ã¼ç¶æãç®¡çããã + * + * @param isBusy ãã¸ã¼ãªãtrueã + */ + private void setCursorBusy(boolean isBusy){ + Cursor cursor; + if(isBusy){ + cursor = Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR); + }else{ + cursor = Cursor.getDefaultCursor(); + } + + Component glassPane = getGlassPane(); + glassPane.setCursor(cursor); + + return; + } + + /** + * ã¢ããªã¦ã£ã³ãã¦ä¸ã®ãã¦ã¹åã³ãã¼å¥åã®ã°ã©ããç®¡çããã + * + *

ãã¸ã¼ç¶æã®å ´åã + * ã¢ããªç»é¢ä¸ã®ãã¦ã¹åã³ãã¼æä½ã¯å¨ã¦äºåã«ã°ã©ãããç¡è¦ãããã + * + * @param isBusy ãã¸ã¼ãªãtrue + */ + private void setUiMask(boolean isBusy){ + Component glassPane = getGlassPane(); + glassPane.setVisible(isBusy); + return; + } + + /** + * ãã¸ã¼ç¶æã®è¨å®ãè¡ãã + * + *

ããã°ã©ã¹ãã¼ã®è¡¨ç¤ºæä½ã¯{@link TopView}ã«å§è²ãããã + * + * @param isBusy trueãªãããã°ã¬ã¹ãã¼ã®ã¢ãã¡éå§&WAITã«ã¼ã½ã«ã + * falseãªãåæ¢&éå¸¸ã«ã¼ã½ã«ã + */ + public void setBusy(boolean isBusy){ + setCursorBusy(isBusy); + setUiMask(isBusy); + this.topView.setBusy(isBusy); + return; + } + } diff --git a/src/main/java/jp/sfjp/jindolf/view/TopView.java b/src/main/java/jp/sfjp/jindolf/view/TopView.java index eab665f..8315720 100644 --- a/src/main/java/jp/sfjp/jindolf/view/TopView.java +++ b/src/main/java/jp/sfjp/jindolf/view/TopView.java @@ -29,11 +29,21 @@ import javax.swing.border.CompoundBorder; import jp.sfjp.jindolf.VerInfo; import jp.sfjp.jindolf.data.Land; import jp.sfjp.jindolf.data.Village; -import jp.sfjp.jindolf.util.GUIUtils; /** * æä¸ä½ãã¥ã¼ã - * ã¡ã¤ã³ã¢ããªã¦ã£ã³ãã¦ã®ã³ã³ãã¼ãã³ãã®è¦ªã³ã³ããã + * + *

{@link JSplitPane}ã®å·¦ã«å½æé¸æãªã¹ãã + * å³ã«ã«ã¼ãã³ã³ãããã¬ã¤ã¢ã¦ããããã + * + *

ã«ã¼ãã³ã³ããä¸ã« + * åæç»é¢ãå½æå ±ããã«{@link LandsTree}ã¨ã¿ããã©ã¦ã¶{@link TabBrowser} + * ã®3ã³ã³ãã¼ãã³ããéãã¦ã¬ã¤ã¢ã¦ããããå¿è¦ã«å¿ãã¦åãæ¿ããã + * + *

ããã¼ãªã¿ã¹ã¯å®è¡ãã¢ãã¼ã«ããããã«ã + * ããã°ã¬ã¹ãã¼ã¨ããã¿ã¡ãã»ã¼ã¸ã®ç®¡çãè¡ãã */ @SuppressWarnings("serial") public class TopView extends JPanel{ @@ -59,10 +69,12 @@ public class TopView extends JPanel{ private final TabBrowser tabBrowser = new TabBrowser(); - private JComponent browsePanel; + // to place toolbar + private final JComponent browsePanel = createBrowsePanel(); + /** - * ããããã¥ã¼ãçæããã + * ã³ã³ã¹ãã©ã¯ã¿ã */ public TopView(){ super(); @@ -81,40 +93,45 @@ public class TopView extends JPanel{ /** * ã«ã¼ãããã«ãçæããã + * * @return ã«ã¼ãããã« */ private JComponent createCards(){ - this.browsePanel = createBrowsePanel(); + JComponent initCard = createInitCard(); + JComponent landInfoCard = createLandInfoCard(); - JPanel panel = new JPanel(); - panel.setLayout(this.cardLayout); - panel.add(INITCARD, createInitCard()); - panel.add(LANDCARD, createLandInfoCard()); - panel.add(BROWSECARD, this.browsePanel); + JPanel cardContainer = new JPanel(); + cardContainer.setLayout(this.cardLayout); - return panel; + cardContainer.add(INITCARD, initCard); + cardContainer.add(LANDCARD, landInfoCard); + cardContainer.add(BROWSECARD, this.browsePanel); + + return cardContainer; } /** * åæããã«ãçæã + * * @return åæããã« */ private JComponent createInitCard(){ - JLabel initMessage = new JLabel("â æãé¸æãã¦ãã ãã"); - - StringBuilder acct = new StringBuilder(); - acct.append("â» åå ä¸ã®æãããäººã¯

"); - acct.append("ã¡ãã¥ã¼ã®ãã¢ã«ã¦ã³ãç®¡çããã

"); - acct.append("ãã°ã¤ã³ãã¦ãã ãã"); - acct.insert(0, "

").append(""); - acct.insert(0, "") .append(""); - acct.insert(0, "") .append(""); - JLabel acctMessage = new JLabel(acct.toString()); + StringBuilder init = new StringBuilder(); + init.append("â äººç¼BBSãµã¼ãããæãé¸æãã¦ãã ãã"); + init.append("

ã¾ãã¯ããã¡ã¤ã«ãã¡ãã¥ã¼ãã"); + init.append("
JinArchiveå½¢å¼ã§ãã¦ã³ãã¼ããã"); + init.append("
ã¢ã¼ã«ã¤ãXMLãã¡ã¤ã«ãéãã¦ãã ãã"); + init.insert(0, "").append(""); + init.insert(0, "").append(""); + init.insert(0, "").append(""); + init.insert(0, "").append(""); + JLabel initMessage = new JLabel(init.toString()); StringBuilder warn = new StringBuilder(); warn.append("â» ãã¾ã«ã¯Webãã©ã¦ã¶ã§ã¢ã¯ã»ã¹ãã¦ã"); warn.append("

"); warn.append("éå¶ã®ååãç¢ºãããããï¼"); + warn.insert(0, "").append(""); warn.insert(0, "").append(""); warn.insert(0, "") .append(""); warn.insert(0, "") .append(""); @@ -130,7 +147,6 @@ public class TopView extends JPanel{ constraints.anchor = GridBagConstraints.CENTER; constraints.gridx = GridBagConstraints.REMAINDER; panel.add(initMessage, constraints); - panel.add(acctMessage, constraints); panel.add(warnMessage, constraints); JScrollPane scrollPane = new JScrollPane(panel); @@ -140,17 +156,20 @@ public class TopView extends JPanel{ /** * å½å¥æå ±ãçæã + * * @return å½å¥æå ± */ private JComponent createLandInfoCard(){ - this.landInfo.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); + Border border = BorderFactory.createEmptyBorder(5, 5, 5, 5); + this.landInfo.setBorder(border); JScrollPane scrollPane = new JScrollPane(this.landInfo); return scrollPane; } /** - * åé¨ãã©ã¦ã¶ãçæã - * @return åé¨ãã©ã¦ã¶ + * ã¿ããã©ã¦ã¶ã«ãã¼ã«ãã¼ãä½µè¨ããããã®ã³ã³ãããçæã + * + * @return ã³ã³ãã */ private JComponent createBrowsePanel(){ JPanel panel = new JPanel(); @@ -164,6 +183,7 @@ public class TopView extends JPanel{ /** * ãã©ã¦ã¶ç¨ãã¼ã«ãã¼ãã»ããããã + * * @param toolbar ãã¼ã«ãã¼ */ public void setBrowseToolBar(JToolBar toolbar){ @@ -173,6 +193,7 @@ public class TopView extends JPanel{ /** * SplitPaneãçæã + * * @param left å·¦ã³ã³ãã¼ãã³ã * @param right å³ã³ã³ãã¼ãã³ã * @return SplitPane @@ -185,17 +206,18 @@ public class TopView extends JPanel{ split.setContinuousLayout(false); split.setOneTouchExpandable(true); split.setDividerLocation(200); - return split; } /** * ã¹ãã¼ã¿ã¹ãã¼ãçæããã + * * @return ã¹ãã¼ã¿ã¹ãã¼ */ private JComponent createStatusBar(){ this.sysMessage.setText(MSG_THANKS); this.sysMessage.setEditable(false); + Border inside = BorderFactory.createBevelBorder(BevelBorder.LOWERED); Border outside = BorderFactory.createEmptyBorder(2, 5, 2, 2); Border border = new CompoundBorder(inside, outside); @@ -226,6 +248,7 @@ public class TopView extends JPanel{ /** * å½æé¸æããªã¼ãã¥ã¼ãè¿ãã + * * @return å½æé¸æããªã¼ãã¥ã¼ */ public JTree getTreeView(){ @@ -234,6 +257,7 @@ public class TopView extends JPanel{ /** * ã¿ããã¥ã¼ãè¿ãã + * * @return ã¿ããã¥ã¼ */ public TabBrowser getTabBrowser(){ @@ -242,6 +266,7 @@ public class TopView extends JPanel{ /** * æä¸è¦§ãã¥ã¼ãè¿ãã + * * @return æä¸çªãã¥ã¼ */ public LandsTree getLandsTree(){ @@ -249,9 +274,10 @@ public class TopView extends JPanel{ } /** - * ããã°ã¬ã¹ãã¼ã¨ã«ã¼ã½ã«ã®è¨å®ãè¡ãã - * @param busy trueãªãããã°ã¬ã¹ãã¼ã®ã¢ãã¡éå§&WAITã«ã¼ã½ã«ã - * falseãªãåæ¢&éå¸¸ã«ã¼ã½ã«ã + * ããã°ã¬ã¹ãã¼ã®è¨å®ãè¡ãã + * + * @param busy trueãªãããã°ã¬ã¹ãã¼ã®ã¢ãã¡éå§ã + * falseãªãåæ¢ã */ public void setBusy(boolean busy){ this.progressBar.setIndeterminate(busy); @@ -260,18 +286,19 @@ public class TopView extends JPanel{ /** * ã¹ãã¼ã¿ã¹ãã¼ã®æ´æ°ã + * * @param message æ´æ°æåå */ public void updateSysMessage(String message){ String text = message; if(message == null) text = ""; this.sysMessage.setText(text); // Thread safe - GUIUtils.dispatchEmptyAWTEvent(); return; } /** * ã¹ãã¼ã¿ã¹ãã¼æååãè¿ãã + * * @return ã¹ãã¼ã¿ã¹ãã¼æåå */ public String getSysMessage(){ @@ -290,19 +317,18 @@ public class TopView extends JPanel{ /** * ææå ±ãè¡¨ç¤ºããã + * * @param village æ */ public void showVillageInfo(Village village){ this.tabBrowser.setVillage(village); this.cardLayout.show(this.cards, BROWSECARD); - this.tabBrowser.repaint(); - this.tabBrowser.revalidate(); - return; } /** * å½æå ±ãè¡¨ç¤ºããã + * * @param land å½ */ public void showLandInfo(Land land){ @@ -311,5 +337,4 @@ public class TopView extends JPanel{ return; } - // TODO setEnabled()ãå¨åãã¬ã¼ã ã«ãæ³¢åãããã¹ãã } diff --git a/src/main/java/jp/sfjp/jindolf/view/WindowManager.java b/src/main/java/jp/sfjp/jindolf/view/WindowManager.java index 7b27168..1949268 100644 --- a/src/main/java/jp/sfjp/jindolf/view/WindowManager.java +++ b/src/main/java/jp/sfjp/jindolf/view/WindowManager.java @@ -7,17 +7,15 @@ package jp.sfjp.jindolf.view; -import java.awt.Component; -import java.awt.Container; +import java.awt.EventQueue; import java.awt.Frame; import java.awt.Window; import java.util.LinkedList; import java.util.List; -import javax.swing.JComponent; -import javax.swing.JMenu; -import javax.swing.JPopupMenu; +import javax.swing.SwingUtilities; +import javax.swing.UIManager; +import javax.swing.UnsupportedLookAndFeelException; import jp.sfjp.jindolf.VerInfo; -import jp.sfjp.jindolf.editor.TalkPreview; import jp.sfjp.jindolf.log.LogFrame; import jp.sfjp.jindolf.summary.DaySummary; import jp.sfjp.jindolf.summary.VillageDigest; @@ -31,14 +29,10 @@ public class WindowManager { getFrameTitle("çºè¨ãã£ã«ã¿"); private static final String TITLE_LOGGER = getFrameTitle("ãã°è¡¨ç¤º"); - private static final String TITLE_EDITOR = - getFrameTitle("çºè¨ã¨ãã£ã¿"); private static final String TITLE_OPTION = getFrameTitle("ãªãã·ã§ã³è¨å®"); private static final String TITLE_FIND = getFrameTitle("çºè¨æ¤ç´¢"); - private static final String TITLE_ACCOUNT = - getFrameTitle("ã¢ã«ã¦ã³ãç®¡ç"); private static final String TITLE_DIGEST = getFrameTitle("æã®ãã¤ã¸ã§ã¹ã"); private static final String TITLE_DAYSUMMARY = @@ -51,10 +45,8 @@ public class WindowManager { private FilterPanel filterPanel; private LogFrame logFrame; - private TalkPreview talkPreview; private OptionPanel optionPanel; private FindPanel findPanel; - private AccountPanel accountPanel; private VillageDigest villageDigest; private DaySummary daySummary; private HelpFrame helpFrame; @@ -74,6 +66,7 @@ public class WindowManager { /** * ã¦ã£ã³ãã¦ã¿ã¤ãã«ã«åç½®è©ãã¤ããã + * * @param text åã¿ã¤ãã« * @return ã¿ã¤ãã«æåå */ @@ -85,6 +78,7 @@ public class WindowManager { /** * çºè¨ãã£ã«ã¿ã¦ã£ã³ãã¦ãçæããã + * * @return çºè¨ãã£ã«ã¿ã¦ã£ã³ãã¦ */ protected FilterPanel createFilterPanel(){ @@ -102,6 +96,7 @@ public class WindowManager { /** * çºè¨ãã£ã«ã¿ã¦ã£ã³ãã¦ãè¿ãã + * * @return çºè¨ãã£ã«ã¿ã¦ã£ã³ãã¦ */ public FilterPanel getFilterPanel(){ @@ -113,6 +108,7 @@ public class WindowManager { /** * ãã°ã¦ã£ã³ãã¦ãçæããã + * * @return ãã°ã¦ã£ã³ãã¦ */ protected LogFrame createLogFrame(){ @@ -132,6 +128,7 @@ public class WindowManager { /** * ãã°ã¦ã£ã³ãã¦ãè¿ãã + * * @return ãã°ã¦ã£ã³ãã¦ */ public LogFrame getLogFrame(){ @@ -142,36 +139,8 @@ public class WindowManager { } /** - * çºè¨ã¨ãã£ã¿ã¦ã£ã³ãã¦ãçæããã - * @return çºè¨ã¨ãã£ã¿ã¦ã£ã³ãã¦ - */ - protected TalkPreview createTalkPreview(){ - TalkPreview result; - - result = new TalkPreview(); - result.setTitle(TITLE_EDITOR); - result.pack(); - result.setSize(700, 500); - result.setVisible(false); - - this.windowSet.add(result); - - return result; - } - - /** - * çºè¨ã¨ãã£ã¿ã¦ã£ã³ãã¦ãè¿ãã - * @return çºè¨ã¨ãã£ã¿ã¦ã£ã³ãã¦ - */ - public TalkPreview getTalkPreview(){ - if(this.talkPreview == null){ - this.talkPreview = createTalkPreview(); - } - return this.talkPreview; - } - - /** * ãªãã·ã§ã³è¨å®ã¦ã£ã³ãã¦ãçæããã + * * @return ãªãã·ã§ã³è¨å®ã¦ã£ã³ãã¦ */ protected OptionPanel createOptionPanel(){ @@ -190,6 +159,7 @@ public class WindowManager { /** * ãªãã·ã§ã³è¨å®ã¦ã£ã³ãã¦ãè¿ãã + * * @return ãªãã·ã§ã³è¨å®ã¦ã£ã³ãã¦ */ public OptionPanel getOptionPanel(){ @@ -201,6 +171,7 @@ public class WindowManager { /** * æ¤ç´¢ã¦ã£ã³ãã¦ãçæããã + * * @return æ¤ç´¢ã¦ã£ã³ãã¦ */ protected FindPanel createFindPanel(){ @@ -218,6 +189,7 @@ public class WindowManager { /** * æ¤ç´¢ã¦ã£ã³ãã¦ãè¿ãã + * * @return æ¤ç´¢ã¦ã£ã³ãã¦ */ public FindPanel getFindPanel(){ @@ -228,35 +200,8 @@ public class WindowManager { } /** - * ãã°ã¤ã³ã¦ã£ã³ãã¦ãçæããã - * @return ãã°ã¤ã³ã¦ã£ã³ãã¦ - */ - protected AccountPanel createAccountPanel(){ - AccountPanel result; - - result = new AccountPanel(NULLPARENT); - result.setTitle(TITLE_ACCOUNT); - result.pack(); - result.setVisible(false); - - this.windowSet.add(result); - - return result; - } - - /** - * ãã°ã¤ã³ã¦ã£ã³ãã¦ãè¿ãã - * @return ãã°ã¤ã³ã¦ã£ã³ãã¦ - */ - public AccountPanel getAccountPanel(){ - if(this.accountPanel == null){ - this.accountPanel = createAccountPanel(); - } - return this.accountPanel; - } - - /** * æãã¤ã¸ã§ã¹ãã¦ã£ã³ãã¦ãçæããã + * * @return æãã¤ã¸ã§ã¹ãã¦ã£ã³ãã¦ */ protected VillageDigest createVillageDigest(){ @@ -275,6 +220,7 @@ public class WindowManager { /** * æãã¤ã¸ã§ã¹ãã¦ã£ã³ãã¦ãè¿ãã + * * @return æãã¤ã¸ã§ã¹ãã¦ã£ã³ãã¦ */ public VillageDigest getVillageDigest(){ @@ -286,6 +232,7 @@ public class WindowManager { /** * çºè¨éè¨ã¦ã£ã³ãã¦ãçæããã + * * @return çºè¨éè¨ã¦ã£ã³ãã¦ */ protected DaySummary createDaySummary(){ @@ -304,6 +251,7 @@ public class WindowManager { /** * çºè¨éè¨ã¦ã£ã³ãã¦ãè¿ãã + * * @return çºè¨éè¨ã¦ã£ã³ãã¦ */ public DaySummary getDaySummary(){ @@ -315,6 +263,7 @@ public class WindowManager { /** * ãã«ãã¦ã£ã³ãã¦ãçæããã + * * @return ãã«ãã¦ã£ã³ãã¦ */ protected HelpFrame createHelpFrame(){ @@ -333,6 +282,7 @@ public class WindowManager { /** * ãã«ãã¦ã£ã³ãã¦ãè¿ãã + * * @return ãã«ãã¦ã£ã³ãã¦ */ public HelpFrame getHelpFrame(){ @@ -344,6 +294,7 @@ public class WindowManager { /** * ããããã¬ã¼ã ãçæããã + * * @return ããããã¬ã¼ã */ protected TopFrame createTopFrame(){ @@ -355,6 +306,7 @@ public class WindowManager { /** * ããããã¬ã¼ã ãè¿ãã + * * @return ããããã¬ã¼ã */ public TopFrame getTopFrame(){ @@ -366,75 +318,26 @@ public class WindowManager { /** * ç®¡çä¸ã«ããå¨ã¦ã£ã³ãã¦ã®LookAndFeelãæ´æ°ããã - * å¿è¦ã«å¿ãã¦åãããã³ã°ãè¡ãããã - */ - public void changeAllWindowUI(){ - for(Window window : this.windowSet){ - updateTreeUI(window); - } - - if(this.filterPanel != null) this.filterPanel.pack(); - if(this.findPanel != null) this.findPanel.pack(); - if(this.accountPanel != null) this.accountPanel.pack(); - - return; - } - - /** - * åå¸°çã«ä¸å±¤ã³ã³ãã¼ãã³ãã®LaFãæ´æ°ããã * - *

{@link javax.swing.SwingUtilities#updateComponentTreeUI(Component)} - * ããããã¢ããã¡ãã¥ã¼ã®LaFæ´æ°ãæ£ããè¡ããªãSunè£½JREã®ãã° - * [BugID:6299213] - * ãåé¿ããããã«ä½ãããã + *

å¿è¦ã«å¿ãã¦åãããã³ã°ãè¡ãããã * - * @param comp éå§ã³ã³ãã¼ãã³ã - * @see - * BugID:6299213 - * + * @param className Look and Feel + * @throws java.lang.ReflectiveOperationException reflection error + * @throws javax.swing.UnsupportedLookAndFeelException Unsupported LAF */ - public static void updateTreeUI(Component comp) { - updateTreeUI(comp, true); - return; - } + public void changeAllWindowUI(String className) + throws ReflectiveOperationException, + UnsupportedLookAndFeelException { + assert EventQueue.isDispatchThread(); - /** - * åå¸°çã«ä¸å±¤ã³ã³ãã¼ãã³ãã®LaFãæ´æ°ããã - * @param comp éå§ã³ã³ãã¼ãã³ã - * @param isRoot ãã®ã³ã³ãã¼ãã³ããæä¸ä½ãå¦ãæå®ããã - * trueãæå®ãããå ´åãLaFæ´æ°ä½æ¥ã®å¾ã«åã¬ã¤ã¢ã¦ããä¿ãã - * ããã©ã¼ãã³ã¹ã®è¦³ç¹ããã - * ãããã¢ããä»¥å¤ã®ä¸å±¤ã³ã³ãã¼ãã³ãã«ã¯ - * å¿è¦ã®ãªãéãfalseæå®ãæ¨å¥¨ã - */ - public static void updateTreeUI(Component comp, boolean isRoot) { - if(comp instanceof JComponent){ - JComponent jcomp = (JComponent) comp; - jcomp.updateUI(); - - JPopupMenu popup = jcomp.getComponentPopupMenu(); - if(popup != null){ - updateTreeUI(popup, true); - } - } + UIManager.setLookAndFeel(className); - if(comp instanceof JMenu){ - JMenu menu = (JMenu) comp; - for(Component child : menu.getMenuComponents()){ - updateTreeUI(child, false); - } - }else if(comp instanceof Container){ - Container cont = (Container) comp; - for(Component child : cont.getComponents()){ - updateTreeUI(child, false); - } - } + this.windowSet.forEach((window) -> { + SwingUtilities.updateComponentTreeUI(window); + }); - if(isRoot){ - comp.invalidate(); - comp.validate(); - comp.repaint(); - } + if(this.filterPanel != null) this.filterPanel.pack(); + if(this.findPanel != null) this.findPanel.pack(); return; } diff --git a/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body01.png b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body01.png new file mode 100644 index 0000000..c0f81e9 Binary files /dev/null and b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body01.png differ diff --git a/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body02.png b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body02.png new file mode 100644 index 0000000..65f6795 Binary files /dev/null and b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body02.png differ diff --git a/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body03.png b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body03.png new file mode 100644 index 0000000..059da6d Binary files /dev/null and b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body03.png differ diff --git a/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body04.png b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body04.png new file mode 100644 index 0000000..322ba38 Binary files /dev/null and b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body04.png differ diff --git a/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body05.png b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body05.png new file mode 100644 index 0000000..01fd8a4 Binary files /dev/null and b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body05.png differ diff --git a/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body06.png b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body06.png new file mode 100644 index 0000000..dc5f7eb Binary files /dev/null and b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body06.png differ diff --git a/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body07.png b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body07.png new file mode 100644 index 0000000..a1b71bf Binary files /dev/null and b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body07.png differ diff --git a/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body08.png b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body08.png new file mode 100644 index 0000000..1a507e2 Binary files /dev/null and b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body08.png differ diff --git a/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body09.png b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body09.png new file mode 100644 index 0000000..6d5bc0b Binary files /dev/null and b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body09.png differ diff --git a/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body10.png b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body10.png new file mode 100644 index 0000000..6e53162 Binary files /dev/null and b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body10.png differ diff --git a/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body11.png b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body11.png new file mode 100644 index 0000000..8f05cc6 Binary files /dev/null and b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body11.png differ diff --git a/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body12.png b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body12.png new file mode 100644 index 0000000..cb98452 Binary files /dev/null and b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body12.png differ diff --git a/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body13.png b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body13.png new file mode 100644 index 0000000..a855dd7 Binary files /dev/null and b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body13.png differ diff --git a/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body14.png b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body14.png new file mode 100644 index 0000000..21c60bc Binary files /dev/null and b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body14.png differ diff --git a/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body15.png b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body15.png new file mode 100644 index 0000000..65b272d Binary files /dev/null and b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body15.png differ diff --git a/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body16.png b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body16.png new file mode 100644 index 0000000..f2ca213 Binary files /dev/null and b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body16.png differ diff --git a/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body17.png b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body17.png new file mode 100644 index 0000000..62a4423 Binary files /dev/null and b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body17.png differ diff --git a/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body18.png b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body18.png new file mode 100644 index 0000000..6c7d02f Binary files /dev/null and b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body18.png differ diff --git a/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body19.png b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body19.png new file mode 100644 index 0000000..88caf59 Binary files /dev/null and b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body19.png differ diff --git a/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body20.png b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body20.png new file mode 100644 index 0000000..9fd2f91 Binary files /dev/null and b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body20.png differ diff --git a/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body99.png b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body99.png new file mode 100644 index 0000000..159d087 Binary files /dev/null and b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/body99.png differ diff --git a/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face01.png b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face01.png new file mode 100644 index 0000000..d18edc1 Binary files /dev/null and b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face01.png differ diff --git a/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face02.png b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face02.png new file mode 100644 index 0000000..1f743bb Binary files /dev/null and b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face02.png differ diff --git a/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face03.png b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face03.png new file mode 100644 index 0000000..dc1c1fc Binary files /dev/null and b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face03.png differ diff --git a/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face04.png b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face04.png new file mode 100644 index 0000000..0bd3e27 Binary files /dev/null and b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face04.png differ diff --git a/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face05.png b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face05.png new file mode 100644 index 0000000..4963724 Binary files /dev/null and b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face05.png differ diff --git a/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face06.png b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face06.png new file mode 100644 index 0000000..ea42bc0 Binary files /dev/null and b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face06.png differ diff --git a/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face07.png b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face07.png new file mode 100644 index 0000000..e8daf7c Binary files /dev/null and b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face07.png differ diff --git a/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face08.png b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face08.png new file mode 100644 index 0000000..555927a Binary files /dev/null and b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face08.png differ diff --git a/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face09.png b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face09.png new file mode 100644 index 0000000..bddc323 Binary files /dev/null and b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face09.png differ diff --git a/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face10.png b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face10.png new file mode 100644 index 0000000..76156cd Binary files /dev/null and b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face10.png differ diff --git a/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face11.png b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face11.png new file mode 100644 index 0000000..0de4b11 Binary files /dev/null and b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face11.png differ diff --git a/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face12.png b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face12.png new file mode 100644 index 0000000..bfe4454 Binary files /dev/null and b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face12.png differ diff --git a/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face13.png b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face13.png new file mode 100644 index 0000000..83d3762 Binary files /dev/null and b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face13.png differ diff --git a/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face14.png b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face14.png new file mode 100644 index 0000000..75ea6b9 Binary files /dev/null and b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face14.png differ diff --git a/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face15.png b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face15.png new file mode 100644 index 0000000..bb6258d Binary files /dev/null and b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face15.png differ diff --git a/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face16.png b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face16.png new file mode 100644 index 0000000..3342b68 Binary files /dev/null and b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face16.png differ diff --git a/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face17.png b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face17.png new file mode 100644 index 0000000..404ae12 Binary files /dev/null and b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face17.png differ diff --git a/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face18.png b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face18.png new file mode 100644 index 0000000..56304b4 Binary files /dev/null and b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face18.png differ diff --git a/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face19.png b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face19.png new file mode 100644 index 0000000..ae10113 Binary files /dev/null and b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face19.png differ diff --git a/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face20.png b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face20.png new file mode 100644 index 0000000..39cfbf8 Binary files /dev/null and b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face20.png differ diff --git a/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face99.png b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face99.png new file mode 100644 index 0000000..b7920d7 Binary files /dev/null and b/src/main/resources/jp/sfjp/jindolf/resources/image/avatar/face99.png differ diff --git a/src/main/resources/jp/sfjp/jindolf/resources/image/avatarCache.json b/src/main/resources/jp/sfjp/jindolf/resources/image/avatarCache.json new file mode 100644 index 0000000..e1a13ab --- /dev/null +++ b/src/main/resources/jp/sfjp/jindolf/resources/image/avatarCache.json @@ -0,0 +1,51 @@ +{ + + "avatarFace" : { + "gerd" : "face01.jpg" , + "walter" : "face02.jpg" , + "moritz" : "face03.jpg" , + "simson" : "face04.jpg" , + "thomas" : "face05.jpg" , + "nicolas" : "face06.jpg" , + "dieter" : "face07.jpg" , + "peter" : "face08.jpg" , + "liesa" : "face09.jpg" , + "albin" : "face10.jpg" , + "katharina" : "face11.jpg" , + "otto" : "face12.jpg" , + "joachim" : "face13.jpg" , + "pamela" : "face14.jpg" , + "jacob" : "face15.jpg" , + "regina" : "face16.jpg" , + "fridel" : "face17.jpg" , + "erna" : "face18.jpg" , + "clara" : "face19.jpg" , + "simon" : "face20.jpg" , + "tomb" : "face99.jpg" + } , + + "avatarBody" : { + "gerd" : "body01.jpg" , + "walter" : "body02.jpg" , + "moritz" : "body03.jpg" , + "simson" : "body04.jpg" , + "thomas" : "body05.jpg" , + "nicolas" : "body06.jpg" , + "dieter" : "body07.jpg" , + "peter" : "body08.jpg" , + "liesa" : "body09.jpg" , + "albin" : "body10.jpg" , + "katharina" : "body11.jpg" , + "otto" : "body12.jpg" , + "joachim" : "body13.jpg" , + "pamela" : "body14.jpg" , + "jacob" : "body15.jpg" , + "regina" : "body16.jpg" , + "fridel" : "body17.jpg" , + "erna" : "body18.jpg" , + "clara" : "body19.jpg" , + "simon" : "body20.jpg" , + "tomb" : "body99.jpg" + } + +} diff --git a/src/main/resources/jp/sfjp/jindolf/resources/wolfbbs/faceIconSet.properties b/src/main/resources/jp/sfjp/jindolf/resources/wolfbbs/faceIconSet.properties index bdfeda7..3917c84 100644 --- a/src/main/resources/jp/sfjp/jindolf/resources/wolfbbs/faceIconSet.properties +++ b/src/main/resources/jp/sfjp/jindolf/resources/wolfbbs/faceIconSet.properties @@ -1,6 +1,6 @@ # # \u307e\u3068\u3081\u30b5\u30a4\u30c8\u5411\u3051\u9854\u30a2\u30a4\u30b3\u30f3\u30bb\u30c3\u30c8\u5b9a\u7fa9 -# \u307e\u3061\u3085\u6c0f\u306e\u904b\u55b6\u3059\u308b\u307e\u3068\u3081\u30b5\u30a4\u30c8\u306f => http://wolfbbs.jp/ +# \u307e\u3061\u3085\u6c0f\u306e\u904b\u55b6\u3059\u308b\u307e\u3068\u3081\u30b5\u30a4\u30c8\u306f => https://wolfbbs.jp/ # # \u203b \u8457\u4f5c\u8ca1\u7523\u6a29\u4fdd\u6301\u8005\u304a\u3088\u3073\u753b\u50cf\u30b5\u30fc\u30d0\u904b\u55b6\u8005\u304b\u3089\u65b0\u3057\u3044\u610f\u5411\u304c\u793a\u3055\u308c\u305f\u5834\u5408\u3001 # \u3000 \u305d\u3061\u3089\u3092\u6700\u512a\u5148\u3067\u5c0a\u91cd\u3057\u3066\u304f\u3060\u3055\u3044\u3002 @@ -13,7 +13,7 @@ # --- start -update = 2016-06-25T05:00:00+09:00 +update = 2020-03-22T16:04:00+09:00 codeCheck = \u72fc iconset.order.100 = nagianPuki @@ -23,7 +23,7 @@ iconset.order.300 = hagiosChimako #iconset.order.500 = kuroink iconset.order.600 = kuroink2 iconset.order.700 = manabio -iconset.order.800 = katainu +#iconset.order.800 = katainu nagianPuki.author = \u51ea\u5eb5 nagianPuki.caption = \u51ea\u5eb5\u6c0f\u4f5c \u65b0\u9854\u30a2\u30a4\u30b3\u30f3 @@ -51,7 +51,7 @@ nagianPuki.iconWiki.simon = &ref(http://ninjinix.x0.com/wolfc/plugin_wolf/im hagiosHandsom.author = hagios hagiosHandsom.caption = hagios\u6c0f\u4f5c \u7f8e\u5f62\u9854\u30a2\u30a4\u30b3\u30f3 -hagiosHandsom.url = http://wolfbbs.jp/hagios.html +hagiosHandsom.url = https://wolfbbs.jp/hagios.html hagiosHandsom.iconWiki.gerd = &ref(http://abendgebet.jp/wolves/face01.jpg,nolink); hagiosHandsom.iconWiki.walter = &ref(http://abendgebet.jp/wolves/face02.jpg,nolink); hagiosHandsom.iconWiki.moritz = &ref(http://abendgebet.jp/wolves/face03.jpg,nolink); @@ -75,7 +75,7 @@ hagiosHandsom.iconWiki.simon = &ref(http://abendgebet.jp/wolves/face20.jpg,n hagiosChimako.author = hagios hagiosChimako.caption = hagios\u6c0f\u4f5c \u3061\u307e\u5b50\u9854\u30a2\u30a4\u30b3\u30f3 -hagiosChimako.url = http://wolfbbs.jp/hagios.html +hagiosChimako.url = https://wolfbbs.jp/hagios.html hagiosChimako.iconWiki.gerd = &ref(http://abendgebet.jp/wolves/mini01.jpg,nolink); hagiosChimako.iconWiki.walter = &ref(http://abendgebet.jp/wolves/mini02.jpg,nolink); hagiosChimako.iconWiki.moritz = &ref(http://abendgebet.jp/wolves/mini03.jpg,nolink); @@ -99,7 +99,7 @@ hagiosChimako.iconWiki.simon = &ref(http://abendgebet.jp/wolves/mini20.jpg,n fernery.author = fernery fernery.caption = \u30d1\u30b9\u30c6\u30eb\u30ab\u30e9\u30fc\u30a2\u30a4\u30b3\u30f3 -fernery.url = http://wolfbbs.jp/fernery.html +fernery.url = https://wolfbbs.jp/fernery.html fernery.iconWiki.gerd = &ref(http://www2.atpaint.jp/limedoline/src/1226856733860.png,nolink); fernery.iconWiki.walter = &ref(http://www2.atpaint.jp/limedoline/src/1226856755265.png,nolink); fernery.iconWiki.moritz = &ref(http://www2.atpaint.jp/limedoline/src/1226856785428.png,nolink); @@ -123,7 +123,7 @@ fernery.iconWiki.simon = &ref(http://www2.atpaint.jp/limedoline/src/12268572 kuroink.author = kuroink kuroink.caption = \u30ad\u30e3\u30e9\u30a2\u30a4\u30b3\u30f3 -kuroink.url = http://wolfbbs.jp/kuroink.html +kuroink.url = https://wolfbbs.jp/kuroink.html kuroink.iconWiki.gerd = &ref(http://www3.atpaint.jp/happato/src/1354520519017.png,nolink); kuroink.iconWiki.walter = &ref(http://www3.atpaint.jp/happato/src/1354531673515.png,nolink); kuroink.iconWiki.moritz = &ref(http://www3.atpaint.jp/happato/src/1354532069882.png,nolink); @@ -147,7 +147,7 @@ kuroink.iconWiki.simon = &ref(http://www3.atpaint.jp/happato/src/13545350947 kuroink2.author = kuroink kuroink2.caption = kuroink\u6c0f\u4f5c \u30ad\u30e3\u30e9\u30a2\u30a4\u30b3\u30f3 -kuroink2.url = http://wolfbbs.jp/kuroink.html +kuroink2.url = https://wolfbbs.jp/kuroink.html kuroink2.iconWiki.gerd = &ref(http://blog-imgs-89.fc2.com/h/e/r/herbsfolles/40ger.png,nolink); kuroink2.iconWiki.walter = &ref(http://blog-imgs-89.fc2.com/h/e/r/herbsfolles/40wal.png,nolink); kuroink2.iconWiki.moritz = &ref(http://blog-imgs-89.fc2.com/h/e/r/herbsfolles/40mor.png,nolink); @@ -171,7 +171,7 @@ kuroink2.iconWiki.simon = &ref(http://blog-imgs-89.fc2.com/h/e/r/herbsfolles manabio.author = manabio manabio.caption = manabio\u6c0f\u4f5c \u30c9\u30c3\u30c8\u7d75\u30a2\u30a4\u30b3\u30f3 -manabio.url = http://wolfbbs.jp/manabio.html +manabio.url = https://wolfbbs.jp/manabio.html manabio.iconWiki.gerd = &ref(http://bbs.mottoki.com/img/haruka1201/1432981752-yj641l.gif,nolink); manabio.iconWiki.walter = &ref(http://bbs.mottoki.com/img/haruka1201/1432981988-oci17k.gif,nolink); manabio.iconWiki.moritz = &ref(http://bbs.mottoki.com/img/haruka1201/1432981960-8mbzqq.gif,nolink); @@ -195,7 +195,7 @@ manabio.iconWiki.simon = &ref(http://bbs.mottoki.com/img/haruka1201/14329821 katainu.author = katainu katainu.caption = katainu\u6c0f\u4f5c \u30ad\u30e3\u30e9\u30a2\u30a4\u30b3\u30f3 -katainu.url = http://wolfbbs.jp/katainu.html +katainu.url = https://wolfbbs.jp/katainu.html katainu.iconWiki.gerd = &ref(http://www.netriver.jp/rbs/usr/kujiro/data/img/IM00001.png,nolink); katainu.iconWiki.walter = &ref(http://www.netriver.jp/rbs/usr/kujiro/data/img/IM00002.png,nolink); katainu.iconWiki.moritz = &ref(http://www.netriver.jp/rbs/usr/kujiro/data/img/IM00005.png,nolink); diff --git a/src/test/java/jp/sfjp/jindolf/JreCheckerTest.java b/src/test/java/jp/sfjp/jindolf/JreCheckerTest.java index e886be4..7cd2fc4 100644 --- a/src/test/java/jp/sfjp/jindolf/JreCheckerTest.java +++ b/src/test/java/jp/sfjp/jindolf/JreCheckerTest.java @@ -58,7 +58,7 @@ public class JreCheckerTest { @Test public void testHas11Runtime() { System.out.println("has11Runtime"); - assertTrue(JreChecker.has11Runtime()); + assertTrue(JreChecker.has1_1Runtime()); return; } @@ -68,7 +68,7 @@ public class JreCheckerTest { @Test public void testHas12Runtime() { System.out.println("has12Runtime"); - assertTrue(JreChecker.has12Runtime()); + assertTrue(JreChecker.has1_2Runtime()); return; } @@ -78,7 +78,7 @@ public class JreCheckerTest { @Test public void testHas13Runtime() { System.out.println("has13Runtime"); - assertTrue(JreChecker.has13Runtime()); + assertTrue(JreChecker.has1_3Runtime()); return; } @@ -88,7 +88,7 @@ public class JreCheckerTest { @Test public void testHas14Runtime() { System.out.println("has14Runtime"); - assertTrue(JreChecker.has14Runtime()); + assertTrue(JreChecker.has1_4Runtime()); return; } @@ -98,7 +98,7 @@ public class JreCheckerTest { @Test public void testHas15Runtime() { System.out.println("has15Runtime"); - assertTrue(JreChecker.has15Runtime()); + assertTrue(JreChecker.has1_5Runtime()); return; } @@ -108,7 +108,7 @@ public class JreCheckerTest { @Test public void testHas16Runtime() { System.out.println("has16Runtime"); - assertTrue(JreChecker.has16Runtime()); + assertTrue(JreChecker.has1_6Runtime()); return; } @@ -118,7 +118,17 @@ public class JreCheckerTest { @Test public void testHas17Runtime() { System.out.println("has17Runtime"); - assertTrue(JreChecker.has17Runtime()); + assertTrue(JreChecker.has1_7Runtime()); + return; + } + + /** + * Test of has18Runtime method, of class JreChecker. + */ + @Test + public void testHas18Runtime() { + System.out.println("has18Runtime"); + assertTrue(JreChecker.has1_8Runtime()); return; } diff --git a/src/test/java/jp/sfjp/jindolf/data/AnchorTest.java b/src/test/java/jp/sfjp/jindolf/data/AnchorTest.java new file mode 100644 index 0000000..fc2a22d --- /dev/null +++ b/src/test/java/jp/sfjp/jindolf/data/AnchorTest.java @@ -0,0 +1,123 @@ +/* + */ + +package jp.sfjp.jindolf.data; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; + +import static org.junit.Assert.*; + +/** + * + */ +public class AnchorTest { + + public AnchorTest() { + } + + @BeforeClass + public static void setUpClass() { + } + + @AfterClass + public static void tearDownClass() { + } + + @Before + public void setUp() { + } + + @After + public void tearDown() { + } + + /** + * Test of parseInt method, of class Anchor. + */ + @Test + public void testParseInt_3args_1() { + System.out.println("parseInt"); + + int result; + Matcher matcher; + Pattern pattern; + String input = "ABC123PQR456XYZ"; + + pattern = Pattern.compile("([0-9]+)[A-Z]*([0-9]+)"); + matcher = pattern.matcher(input); + + assertTrue(matcher.find()); + + result = Anchor.parseInt(input, matcher, 1); + assertEquals(123, result); + + result = Anchor.parseInt(input, matcher, 2); + assertEquals(456, result); + + try{ + Anchor.parseInt(null, matcher, 1); + fail(); + }catch(NullPointerException e){ + } + + try{ + Anchor.parseInt(input, null, 1); + fail(); + }catch(NullPointerException e){ + } + + return; + } + + /** + * Test of parseInt method, of class Anchor. + */ + @Test + public void testParseInt_3args_2() { + System.out.println("parseInt"); + + int result; + + try{ + Anchor.parseInt(null, 1, 3); + fail(); + }catch(NullPointerException e){ + } + + result = Anchor.parseInt("1234567", 2, 5); + assertEquals(345, result); + + result = Anchor.parseInt("1234567", 2, 3); + assertEquals(3, result); + + result = Anchor.parseInt("1234567", 2, 2); + assertEquals(0, result); + + result = Anchor.parseInt("1234567", 2, 1); + assertEquals(0, result); + + result = Anchor.parseInt("1234567", 0, 0); + assertEquals(0, result); + + try{ + Anchor.parseInt("1234567", 2, 999); + fail(); + }catch(StringIndexOutOfBoundsException e){ + } + + try{ + Anchor.parseInt("1234567", -1, 5); + fail(); + }catch(StringIndexOutOfBoundsException e){ + } + + return; + } + +} diff --git a/src/test/java/jp/sfjp/jindolf/data/AvatarTest.java b/src/test/java/jp/sfjp/jindolf/data/AvatarTest.java index e852a6b..352e3a1 100644 --- a/src/test/java/jp/sfjp/jindolf/data/AvatarTest.java +++ b/src/test/java/jp/sfjp/jindolf/data/AvatarTest.java @@ -7,8 +7,6 @@ package jp.sfjp.jindolf.data; import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; @@ -54,59 +52,15 @@ public class AvatarTest { } /** - * Test of getPredefinedAvatar method, of class Avatar. + * Test of getAvatarByFullname method, of class Avatar. */ @Test - public void testGetPredefinedAvatar(){ + public void testGetAvatarByFullname(){ System.out.println("getPredefinedAvatar"); Avatar result; - result = Avatar.getPredefinedAvatar("è¾²å¤« ã¤ã³ã"); + result = Avatar.getAvatarByFullname("è¾²å¤« ã¤ã³ã"); assertNotNull(result); assertTrue(result.equals(result)); - result = Avatar.getPredefinedAvatar((CharSequence)"è¾²å¤« ã¤ã³ã"); - assertNotNull(result); - assertTrue(result.equals(result)); - return; - } - - /** - * Test of lookingAtAvatar method, of class Avatar. - */ - @Test - public void testMatchAvatar(){ - System.out.println("matchAvatar"); - Matcher matcher; - Avatar avatar; - - Pattern pattern = Pattern.compile(".+"); - - matcher = pattern.matcher("è¾²å¤« ã¤ã³ã"); - avatar = Avatar.lookingAtAvatar(matcher); - assertNotNull(avatar); - assertEquals("è¾²å¤« ã¤ã³ã", avatar.getFullName()); - - matcher = pattern.matcher("è¾²å¤« ã¤ã³ãXYZ"); - avatar = Avatar.lookingAtAvatar(matcher); - assertNotNull(avatar); - assertEquals("è¾²å¤« ã¤ã³ã", avatar.getFullName()); - - matcher = pattern.matcher("ABCè¾²å¤« ã¤ã³ã"); - avatar = Avatar.lookingAtAvatar(matcher); - assertNull(avatar); - - matcher = pattern.matcher("è¾²å¤« ã¤ã³ããªããè ãã£ã¼ã¿ã¼"); - avatar = Avatar.lookingAtAvatar(matcher); - assertNotNull(avatar); - assertEquals("è¾²å¤« ã¤ã³ã", avatar.getFullName()); - int regionStart; - int regionEnd; - regionStart = matcher.end(); - regionEnd = matcher.regionEnd(); - matcher.region(regionStart, regionEnd); - avatar = Avatar.lookingAtAvatar(matcher); - assertNotNull(avatar); - assertEquals("ãªããè ãã£ã¼ã¿ã¼", avatar.getFullName()); - return; } @@ -116,7 +70,7 @@ public class AvatarTest { @Test public void testGetFullName(){ System.out.println("getFullName"); - Avatar result = Avatar.getPredefinedAvatar("è¾²å¤« ã¤ã³ã"); + Avatar result = Avatar.getAvatarByFullname("è¾²å¤« ã¤ã³ã"); assertNotNull(result); assertEquals("è¾²å¤« ã¤ã³ã", result.getFullName()); return; @@ -128,7 +82,7 @@ public class AvatarTest { @Test public void testGetJobTitle(){ System.out.println("getJobTitle"); - Avatar result = Avatar.getPredefinedAvatar("è¾²å¤« ã¤ã³ã"); + Avatar result = Avatar.getAvatarByFullname("è¾²å¤« ã¤ã³ã"); assertNotNull(result); assertEquals("è¾²å¤«", result.getJobTitle()); return; @@ -140,7 +94,7 @@ public class AvatarTest { @Test public void testGetName(){ System.out.println("getName"); - Avatar result = Avatar.getPredefinedAvatar("è¾²å¤« ã¤ã³ã"); + Avatar result = Avatar.getAvatarByFullname("è¾²å¤« ã¤ã³ã"); assertNotNull(result); assertEquals("ã¤ã³ã", result.getName()); return; @@ -152,7 +106,7 @@ public class AvatarTest { @Test public void testGetIdNum(){ System.out.println("getIdNum"); - Avatar result = Avatar.getPredefinedAvatar("è¾²å¤« ã¤ã³ã"); + Avatar result = Avatar.getAvatarByFullname("è¾²å¤« ã¤ã³ã"); assertNotNull(result); assertEquals(15, result.getIdNum()); return; @@ -164,7 +118,7 @@ public class AvatarTest { @Test public void testEquals(){ System.out.println("equals"); - Avatar result = Avatar.getPredefinedAvatar("è¾²å¤« ã¤ã³ã"); + Avatar result = Avatar.getAvatarByFullname("è¾²å¤« ã¤ã³ã"); assertTrue(result.equals(result)); return; } @@ -175,9 +129,9 @@ public class AvatarTest { @Test public void testCompareTo(){ System.out.println("compareTo"); - Avatar avatar1 = Avatar.getPredefinedAvatar("è¾²å¤« ã¤ã³ã"); - Avatar avatar2 = Avatar.getPredefinedAvatar("ã·ã¹ã¿ã¼ ããªã¼ãã«"); - Avatar avatar3 = Avatar.getPredefinedAvatar("ç¾é£¼ã ã«ã¿ãªã"); + Avatar avatar1 = Avatar.getAvatarByFullname("è¾²å¤« ã¤ã³ã"); + Avatar avatar2 = Avatar.getAvatarByFullname("ã·ã¹ã¿ã¼ ããªã¼ãã«"); + Avatar avatar3 = Avatar.getAvatarByFullname("ç¾é£¼ã ã«ã¿ãªã"); assertTrue(avatar1.compareTo(avatar2) < 0); assertTrue(avatar2.compareTo(avatar3) > 0); assertTrue(avatar2.compareTo(avatar2) == 0); diff --git a/src/test/java/jp/sfjp/jindolf/data/TalkTest.java b/src/test/java/jp/sfjp/jindolf/data/TalkTest.java new file mode 100644 index 0000000..103fb99 --- /dev/null +++ b/src/test/java/jp/sfjp/jindolf/data/TalkTest.java @@ -0,0 +1,102 @@ +/* + */ + +package jp.sfjp.jindolf.data; + +import jp.sourceforge.jindolf.corelib.TalkType; +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; + +import static org.junit.Assert.*; + +/** + * + */ +public class TalkTest { + + public TalkTest() { + } + + @BeforeClass + public static void setUpClass() { + } + + @AfterClass + public static void tearDownClass() { + } + + @Before + public void setUp() { + } + + @After + public void tearDown() { + } + + /** + * Test of encodeColorName method, of class Talk. + */ + @Test + public void testEncodeColorName() { + System.out.println("encodeColorName"); + + assertEquals("ç½", Talk.encodeColorName(TalkType.PUBLIC)); + assertEquals("ç°", Talk.encodeColorName(TalkType.PRIVATE)); + assertEquals("èµ¤", Talk.encodeColorName(TalkType.WOLFONLY)); + assertEquals("é", Talk.encodeColorName(TalkType.GRAVE)); + + try{ + Talk.encodeColorName(null); + fail(); + }catch(NullPointerException e){ + assert true; + } + + return; + } + + /** + * Test of isTerminated method, of class Talk. + */ + @Test + public void testIsTerminated() { + System.out.println("isTerminated"); + + try{ + Talk.isTerminated(null, null); + fail(); + }catch(NullPointerException e){ + assert true; + } + + try{ + Talk.isTerminated("A", null); + fail(); + }catch(NullPointerException e){ + assert true; + } + + try{ + Talk.isTerminated(null, "X"); + fail(); + }catch(NullPointerException e){ + assert true; + } + + assertTrue(Talk.isTerminated("ABCXYZ", "XYZ")); + assertTrue(Talk.isTerminated("ABCXYZ", "ABCXYZ")); + assertTrue(Talk.isTerminated("ABCXYZ", "")); + assertTrue(Talk.isTerminated("", "")); + + assertFalse(Talk.isTerminated("ABCXYZ", "PQR")); + assertFalse(Talk.isTerminated("ABCXYZ", "1ABCXYZ")); + assertFalse(Talk.isTerminated("ABC", "ABCXYZ")); + assertFalse(Talk.isTerminated("", "XYZ")); + + return; + } + +} diff --git a/src/test/java/jp/sfjp/jindolf/net/HttpUtilsTest.java b/src/test/java/jp/sfjp/jindolf/net/HttpUtilsTest.java index aba3523..280fd5c 100644 --- a/src/test/java/jp/sfjp/jindolf/net/HttpUtilsTest.java +++ b/src/test/java/jp/sfjp/jindolf/net/HttpUtilsTest.java @@ -73,6 +73,11 @@ public class HttpUtilsTest { result = HttpUtils.escapeHttpComment(comment); assertEquals(expResult, result); + comment = "aðb"; + expResult = "(a?b)"; + result = HttpUtils.escapeHttpComment(comment); + assertEquals(expResult, result); + return; } @@ -113,6 +118,7 @@ public class HttpUtilsTest { /** * Test of formatHttpStat method, of class HttpUtils. + * @throws java.lang.Exception */ @Test public void testFormatHttpStat() throws Exception{ @@ -150,6 +156,7 @@ public class HttpUtilsTest { /** * Test of getHTMLCharset method, of class HttpUtils. + * @throws java.lang.Exception */ @Test public void testGetHTMLCharset_URLConnection() throws Exception{ diff --git a/src/test/java/jp/sfjp/jindolf/util/StringUtilsTest.java b/src/test/java/jp/sfjp/jindolf/util/StringUtilsTest.java index c8b70fe..7610998 100644 --- a/src/test/java/jp/sfjp/jindolf/util/StringUtilsTest.java +++ b/src/test/java/jp/sfjp/jindolf/util/StringUtilsTest.java @@ -6,8 +6,6 @@ package jp.sfjp.jindolf.util; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; @@ -41,122 +39,6 @@ public class StringUtilsTest { } /** - * Test of parseInt method, of class StringUtils. - */ - @Test - public void testParseInt_3args_1(){ - System.out.println("parseInt"); - - int result; - Matcher matcher; - Pattern pattern; - String input = "ABC123PQR456XYZ"; - - pattern = Pattern.compile("([0-9]+)[A-Z]*([0-9]+)"); - matcher = pattern.matcher(input); - - assertTrue(matcher.find()); - - result = StringUtils.parseInt(input, matcher, 1); - assertEquals(123, result); - - result = StringUtils.parseInt(input, matcher, 2); - assertEquals(456, result); - - try{ - StringUtils.parseInt(null, matcher, 1); - fail(); - }catch(NullPointerException e){ - } - - try{ - StringUtils.parseInt(input, null, 1); - fail(); - }catch(NullPointerException e){ - } - - return; - } - - /** - * Test of parseInt method, of class StringUtils. - */ - @Test - public void testParseInt_CharSequence(){ - System.out.println("parseInt"); - - int result; - - try{ - StringUtils.parseInt(null); - fail(); - }catch(NullPointerException e){ - } - - result = StringUtils.parseInt(""); - assertEquals(0, result); - - result = StringUtils.parseInt("0"); - assertEquals(0, result); - - result = StringUtils.parseInt("999"); - assertEquals(999, result); - - result = StringUtils.parseInt("X"); - assertEquals(0, result); - - result = StringUtils.parseInt("-1"); - assertEquals(0, result); - - return; - } - - /** - * Test of parseInt method, of class StringUtils. - */ - @Test - public void testParseInt_3args_2(){ - System.out.println("parseInt"); - - int result; - - try{ - StringUtils.parseInt(null, 1, 3); - fail(); - }catch(NullPointerException e){ - } - - result = StringUtils.parseInt("1234567", 2, 5); - assertEquals(345, result); - - result = StringUtils.parseInt("1234567", 2, 3); - assertEquals(3, result); - - result = StringUtils.parseInt("1234567", 2, 2); - assertEquals(0, result); - - result = StringUtils.parseInt("1234567", 2, 1); - assertEquals(0, result); - - result = StringUtils.parseInt("1234567", 0, 0); - assertEquals(0, result); - - try{ - StringUtils.parseInt("1234567", 2, 999); - fail(); - }catch(StringIndexOutOfBoundsException e){ - } - - try{ - StringUtils.parseInt("1234567", -1, 5); - fail(); - }catch(StringIndexOutOfBoundsException e){ - } - - return; - } - - /** * Test of suppressString method, of class StringUtils. */ @Test @@ -187,42 +69,6 @@ public class StringUtilsTest { } /** - * Test of isTerminated method, of class StringUtils. - */ - @Test - public void testIsTerminated(){ - System.out.println("isTerminated"); - - try{ - StringUtils.isTerminated(null, null); - fail(); - }catch(NullPointerException e){ - } - - try{ - StringUtils.isTerminated("A", null); - fail(); - }catch(NullPointerException e){ - } - - try{ - StringUtils.isTerminated(null, "X"); - fail(); - }catch(NullPointerException e){ - } - - assertTrue(StringUtils.isTerminated("ABCXYZ", "XYZ")); - assertTrue(StringUtils.isTerminated("ABCXYZ", "")); - assertTrue(StringUtils.isTerminated("", "")); - - assertFalse(StringUtils.isTerminated("ABCXYZ", "PQR")); - assertFalse(StringUtils.isTerminated("ABC", "ABCXYZ")); - assertFalse(StringUtils.isTerminated("", "XYZ")); - - return; - } - - /** * Test of compareSubSequence method, of class StringUtils. */ @Test