← Back to branch summary

~ubuntu-branches/ubuntu/quantal/simple-xml/quantal

« back to all changes in this revision

Viewing changes to src/org/simpleframework/xml/stream/PrefixResolver.java

  • Committer: Bazaar Package Importer
  • Author(s): Sylvestre Ledru, Fabian Köster
  • Date: 2010-03-05 19:44:34 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20100305194434-d9mwhyioc9npo9it
Tags: 2.3.2-1
* Standards-Version updated to version 3.8.4

[ Fabian Köster ]
* New upstream release
* Correct license information in debian/pom.xml
* Exclude generated Javadoc from orig-tarball

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/org/simpleframework/xml/stream/PrefixResolver.java
128
128
      int size = size();
129
129
      
130
130
      if(size > 0) {
131
 
         String prefix = super.get(reference);
 
131
         String prefix = super.get(reference); 
132
132
   
133
133
         if(prefix != null) {
134
134
            return prefix;
149
149
   private String resolve(String reference) {
150
150
      NamespaceMap parent = source.getNamespaces();
151
151
      
152
 
      if(parent == null) {
153
 
         return null;
 
152
      if(parent != null) {
 
153
         String prefix = parent.get(reference);
 
154
         
 
155
         if(!containsValue(prefix)) {
 
156
            return prefix;
 
157
         }
154
158
      }
155
 
      return parent.get(reference);
 
159
      return null;
156
160
   }
157
161
   
158
162
   /**