From dcdabf9a956e0d81134abb5ae8ccb646ad6cc1a1 Mon Sep 17 00:00:00 2001 From: tama3 Date: Tue, 12 Jun 2007 07:35:40 +0000 Subject: [PATCH] show message dialog when class path checker action performed git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/stigmata/trunk@126 acee48c3-7b26-0410-bdac-b3d0e5314bbc --- .../se/stigmata/ui/swing/ClasspathSettingsPane.java | 16 +++++++++++++--- src/main/resources/resources/messages.properties | 3 ++- .../birthmarks/smc/SmcBirthmarkExtractorTest.java | 19 ++++++++++--------- 3 files changed, 25 insertions(+), 13 deletions(-) diff --git a/src/main/java/jp/naist/se/stigmata/ui/swing/ClasspathSettingsPane.java b/src/main/java/jp/naist/se/stigmata/ui/swing/ClasspathSettingsPane.java index b7a7414..5446c65 100755 --- a/src/main/java/jp/naist/se/stigmata/ui/swing/ClasspathSettingsPane.java +++ b/src/main/java/jp/naist/se/stigmata/ui/swing/ClasspathSettingsPane.java @@ -16,6 +16,7 @@ import javax.swing.Box; import javax.swing.JButton; import javax.swing.JComponent; import javax.swing.JLabel; +import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JTextField; import javax.swing.border.TitledBorder; @@ -143,15 +144,24 @@ public class ClasspathSettingsPane extends JPanel{ }); ActionListener action = new ActionListener(){ public void actionPerformed(ActionEvent e){ - boolean flag = findClass(text.getText().trim()); + String t = text.getText().trim(); + boolean flag = findClass(t); + String message = Messages.getString("classpathchecker.found.tooltip"); if(flag){ label.setIcon(Utility.getIcon("classpathchecker.found.icon")); - label.setToolTipText(Messages.getString("classpathchecker.found.tooltip")); } else{ label.setIcon(Utility.getIcon("classpathchecker.notfound.icon")); - label.setToolTipText(Messages.getString("classpathchecker.notfound.tooltip")); + message = Messages.getString("classpathchecker.notfound.tooltip"); } + label.setToolTipText(message); + String dm = String.format( + "
%s
%s
", t, message + ); + JOptionPane.showMessageDialog( + stigmata, dm, Messages.getString("classpathchecker.dialog.title"), + JOptionPane.INFORMATION_MESSAGE + ); } }; findButton.addActionListener(action); diff --git a/src/main/resources/resources/messages.properties b/src/main/resources/resources/messages.properties index 65fafe9..6d31bf8 100755 --- a/src/main/resources/resources/messages.properties +++ b/src/main/resources/resources/messages.properties @@ -205,7 +205,8 @@ classpathchecker.default.tooltip= classpathchecker.found.icon=accept.png classpathchecker.found.tooltip=Found! classpathchecker.notfound.icon=error.png -classpathchecker.notfound.tooltip=Not Found! +classpathchecker.notfound.tooltip=Not found! +classpathchecker.dialog.title=Classpath Checker ################################################ #CompareTablePane diff --git a/src/test/java/jp/naist/se/stigmata/birthmarks/smc/SmcBirthmarkExtractorTest.java b/src/test/java/jp/naist/se/stigmata/birthmarks/smc/SmcBirthmarkExtractorTest.java index 72a1c01..18970f7 100755 --- a/src/test/java/jp/naist/se/stigmata/birthmarks/smc/SmcBirthmarkExtractorTest.java +++ b/src/test/java/jp/naist/se/stigmata/birthmarks/smc/SmcBirthmarkExtractorTest.java @@ -38,7 +38,7 @@ public class SmcBirthmarkExtractorTest{ Birthmark birthmark = array[0].getBirthmark("smc"); Assert.assertEquals("smc", birthmark.getType()); - Assert.assertEquals(76, birthmark.getElementCount()); + Assert.assertEquals(77, birthmark.getElementCount()); BirthmarkElement[] elements = birthmark.getElements(); for(int i = 0; i < elements.length; i++){ @@ -71,12 +71,12 @@ public class SmcBirthmarkExtractorTest{ Assert.assertEquals("java.lang.String#endsWith", elements[index++].getValue()); Assert.assertEquals("java.util.List#add", elements[index++].getValue()); Assert.assertEquals("java.util.List#iterator", elements[index++].getValue()); + Assert.assertEquals("java.util.Iterator#hasNext", elements[index++].getValue()); Assert.assertEquals("java.util.Iterator#next", elements[index++].getValue()); + Assert.assertEquals("java.util.Iterator#hasNext", elements[index++].getValue()); Assert.assertEquals("java.util.Iterator#next", elements[index++].getValue()); Assert.assertEquals("java.net.URL#openStream", elements[index++].getValue()); Assert.assertEquals("java.util.List#add", elements[index++].getValue()); - Assert.assertEquals("java.util.Iterator#hasNext", elements[index++].getValue()); - Assert.assertEquals("java.util.Iterator#hasNext", elements[index++].getValue()); Assert.assertEquals("java.util.List#size", elements[index++].getValue()); Assert.assertEquals("java.util.List#toArray", elements[index++].getValue()); Assert.assertEquals("java.util.ArrayList#", elements[index++].getValue()); @@ -84,50 +84,51 @@ public class SmcBirthmarkExtractorTest{ Assert.assertEquals("java.lang.Object#getClass", elements[index++].getValue()); Assert.assertEquals("java.lang.Class#getName", elements[index++].getValue()); Assert.assertEquals("java.util.logging.Logger#getLogger", elements[index++].getValue()); - Assert.assertEquals("java.lang.String#valueOf", elements[index++].getValue()); Assert.assertEquals("java.lang.StringBuilder#", elements[index++].getValue()); Assert.assertEquals("java.lang.StringBuilder#append", elements[index++].getValue()); + Assert.assertEquals("java.lang.StringBuilder#append", elements[index++].getValue()); Assert.assertEquals("java.lang.StringBuilder#toString", elements[index++].getValue()); Assert.assertEquals("java.util.logging.Logger#warning", elements[index++].getValue()); Assert.assertEquals("java.util.List#size", elements[index++].getValue()); Assert.assertEquals("java.util.List#toArray", elements[index++].getValue()); Assert.assertEquals("java.util.ArrayList#", elements[index++].getValue()); + Assert.assertEquals("java.util.Iterator#hasNext", elements[index++].getValue()); Assert.assertEquals("java.util.Iterator#next", elements[index++].getValue()); Assert.assertEquals("java.lang.Double#valueOf", elements[index++].getValue()); Assert.assertEquals("java.util.List#add", elements[index++].getValue()); - Assert.assertEquals("java.util.Iterator#hasNext", elements[index++].getValue()); Assert.assertEquals("java.util.List#iterator", elements[index++].getValue()); + Assert.assertEquals("java.util.Iterator#hasNext", elements[index++].getValue()); Assert.assertEquals("java.util.Iterator#next", elements[index++].getValue()); Assert.assertEquals("java.lang.Double#doubleValue", elements[index++].getValue()); Assert.assertEquals("java.lang.Double#doubleValue", elements[index++].getValue()); - Assert.assertEquals("java.util.Iterator#hasNext", elements[index++].getValue()); Assert.assertEquals("org.apache.commons.beanutils.BeanUtils#describe", elements[index++].getValue()); Assert.assertEquals("java.util.Map#remove", elements[index++].getValue()); Assert.assertEquals("java.util.Map#remove", elements[index++].getValue()); Assert.assertEquals("java.util.Map#keySet", elements[index++].getValue()); Assert.assertEquals("java.util.Set#iterator", elements[index++].getValue()); + Assert.assertEquals("java.util.Iterator#hasNext", elements[index++].getValue()); Assert.assertEquals("java.util.Iterator#next", elements[index++].getValue()); Assert.assertEquals("java.lang.StringBuilder#", elements[index++].getValue()); Assert.assertEquals("java.lang.StringBuilder#append", elements[index++].getValue()); Assert.assertEquals("java.lang.StringBuilder#append", elements[index++].getValue()); + Assert.assertEquals("java.lang.StringBuilder#append", elements[index++].getValue()); Assert.assertEquals("java.lang.String#valueOf", elements[index++].getValue()); Assert.assertEquals("java.lang.StringBuilder#append", elements[index++].getValue()); Assert.assertEquals("java.lang.StringBuilder#toString", elements[index++].getValue()); Assert.assertEquals("org.apache.commons.beanutils.BeanUtils#setProperty", elements[index++].getValue()); - Assert.assertEquals("java.util.Iterator#hasNext", elements[index++].getValue()); Assert.assertEquals("java.io.ByteArrayInputStream#", elements[index++].getValue()); Assert.assertEquals("java.io.ByteArrayOutputStream#", elements[index++].getValue()); - Assert.assertEquals("java.io.ByteArrayOutputStream#write", elements[index++].getValue()); Assert.assertEquals("java.io.InputStream#read", elements[index++].getValue()); + Assert.assertEquals("java.io.ByteArrayOutputStream#write", elements[index++].getValue()); Assert.assertEquals("java.io.ByteArrayOutputStream#toByteArray", elements[index++].getValue()); Assert.assertEquals("java.io.ByteArrayOutputStream#close", elements[index++].getValue()); Assert.assertEquals("javax.imageio.spi.ServiceRegistry#lookupProviders", elements[index++].getValue()); - Assert.assertEquals("java.util.Iterator#next", elements[index++].getValue()); Assert.assertEquals("java.util.Iterator#hasNext", elements[index++].getValue()); + Assert.assertEquals("java.util.Iterator#next", elements[index++].getValue()); } @Test -- 2.11.0