Changeset 9393 for extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/mainframe/MainFrame.java

Timestamp:

Feb 27, 2011, 1:38:31 PM (13 years ago)

Author:

mlg

Message:

Modifications to use the last version of jiwigo-ws-api

File:

• extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/mainframe/MainFrame.java (modified) (6 diffs)

extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/mainframe/MainFrame.java

@@ -23 +23 @@
 
 import fr.mael.jiwigo.transverse.util.Messages;
-import fr.mael.jiwigo.transverse.util.Outil;
+import fr.mael.jiwigo.transverse.util.Tools;
 import fr.mael.jiwigo.ui.MyCollapsiblePanel;
 import fr.mael.jiwigo.ui.browser.BrowserPanel;
@@ -55 +55 @@
    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-   
+
  * @author mael
  * Frame principale
@@ -150 +150 @@
     private MainFrame() {
         this.setTitle("Jiwigo v" + Messages.getMessage("version"));
-        this.setIconImage(java.awt.Toolkit.getDefaultToolkit().getImage(Outil.getURL("fr/mael/jiwigo/img/icon.png")));
+        this.setIconImage(java.awt.Toolkit.getDefaultToolkit().getImage(Tools.getURL("fr/mael/jiwigo/img/icon.png")));
         this.setLayout(new BorderLayout());
         jMenuBar = new JMenuBar();
@@ -225 +225 @@
             JScrollPane scroll = (JScrollPane) tabbedPane.getComponentAt(i);
             IThumbnailPanel thumbPan = (IThumbnailPanel) scroll.getViewport().getComponents()[0];
-            if (thumbPan.getCategory().getIdentifiant().equals(panel.getCategory().getIdentifiant())) {
+            if (thumbPan.getCategory().getIdentifier().equals(panel.getCategory().getIdentifier())) {
                 //only if it's not for a re
                 if (!(panel instanceof ThumbnailSearchPanel)) {
@@ -237 +237 @@
         //is the name of the category
         if (!found && !isSearch) {
-            tabbedPane.addTab(panel.getCategory().getNom(), scrollPaneImagesPanel, new ImageIcon(Outil
+            tabbedPane.addTab(panel.getCategory().getName(), scrollPaneImagesPanel, new ImageIcon(Tools
                     .getURL("fr/mael/jiwigo/img/closetab.png")));
             //if it's for a research, the title of the tab
@@ -244 +244 @@
             String queryString = ((ThumbnailSearchPanel) panel).getQueryString();
             tabbedPane.addTab(Messages.getMessage("mainFrame_search") + queryString, scrollPaneImagesPanel,
-                    new ImageIcon(Outil.getURL("fr/mael/jiwigo/img/closetab.png")));
+                    new ImageIcon(Tools.getURL("fr/mael/jiwigo/img/closetab.png")));
         }