← Back to branch summary

~ubuntu-branches/ubuntu/quantal/zeroc-ice/quantal

« back to all changes in this revision

Viewing changes to java/src/IceGridGUI/Application/Editable.java

  • Committer: Bazaar Package Importer
  • Author(s): Cleto Martin Angelina
  • Date: 2011-04-25 18:44:24 UTC
  • mfrom: (6.1.14 sid)
  • Revision ID: james.westby@ubuntu.com-20110425184424-sep9i9euu434vq4c
Tags: 3.4.1-7
http://bugs.debian.org/623555
* Bug fix: "libdb5.1-java.jar was renamed to db.jar", thanks to Ondřej
  Surý (Closes: #623555).
* Bug fix: "causes noise in php5", thanks to Jayen Ashar (Closes:
  #623533).

Show diffs side-by-side

added added

removed removed

Lines of Context:
java/src/IceGridGUI/Application/Editable.java
1
1
// **********************************************************************
2
2
//
3
 
// Copyright (c) 2003-2009 ZeroC, Inc. All rights reserved.
 
3
// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
4
4
//
5
5
// This copy of Ice is licensed to you under the terms described in the
6
6
// ICE_LICENSE file included in this distribution.
7
7
//
8
8
// **********************************************************************
 
9
 
9
10
package IceGridGUI.Application;
10
11
 
11
12
class Editable implements Cloneable
46
47
    {
47
48
        if(!editable.isNew())
48
49
        {
49
 
            java.util.TreeSet set = (java.util.TreeSet)_removedElements.get(forClass);
 
50
            java.util.TreeSet<String> set = _removedElements.get(forClass);
50
51
            if(set == null)
51
52
            {
52
 
                set = new java.util.TreeSet();
 
53
                set = new java.util.TreeSet<String>();
53
54
                _removedElements.put(forClass, set);
54
55
            }
55
56
            set.add(id);
58
59
    
59
60
    String[] removedElements(Class forClass)
60
61
    {
61
 
        java.util.TreeSet set = (java.util.TreeSet)_removedElements.get(forClass);
 
62
        java.util.TreeSet<String> set = _removedElements.get(forClass);
62
63
        if(set == null)
63
64
        {
64
65
            return new String[0];
65
66
        }
66
67
        else
67
68
        {
68
 
            return (String[])set.toArray(new String[0]);
 
69
            return set.toArray(new String[0]);
69
70
        }
70
71
    }
71
72
 
74
75
        try
75
76
        {
76
77
            Editable result = (Editable)clone();
77
 
            java.util.HashMap removedElements = new java.util.HashMap();
78
 
            java.util.Iterator p = result._removedElements.entrySet().iterator();
79
 
            while(p.hasNext())
 
78
            java.util.HashMap<Class, java.util.TreeSet<String>> removedElements =
 
79
                new java.util.HashMap<Class, java.util.TreeSet<String>>();
 
80
            for(java.util.Map.Entry<Class, java.util.TreeSet<String>> p : result._removedElements.entrySet())
80
81
            {
81
 
                java.util.Map.Entry entry = (java.util.Map.Entry)p.next();
82
 
                Object val = ((java.util.TreeSet)entry.getValue()).clone();
83
 
                removedElements.put(entry.getKey(), val);
 
82
                java.util.TreeSet<String> val = new java.util.TreeSet<String>(p.getValue());
 
83
                removedElements.put(p.getKey(), val);
84
84
            }
85
85
            result._removedElements = removedElements;
86
86
            return result;
102
102
    private boolean _isNew = false;
103
103
    private boolean _modified = false;
104
104
 
105
 
    private java.util.HashMap _removedElements = new java.util.HashMap();
 
105
    private java.util.HashMap<Class, java.util.TreeSet<String>> _removedElements =
 
106
        new java.util.HashMap<Class, java.util.TreeSet<String>>();
106
107
}