ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/repos/AntTasks/source/net/douglasthrift/anttasks/AAPTPackage.java
(Generate patch)

Comparing AntTasks/source/net/douglasthrift/anttasks/AAPTPackage.java (file contents):
Revision 1113 by douglas, 2008-11-11T23:06:07-08:00 vs.
Revision 1183 by douglas, 2009-05-23T22:43:47-07:00

# Line 45 | Line 45 | public class AAPTPackage extends Command
45          private Path include_;
46          private File assets_;
47          private File publicDefinitions_;
48 <        private File resource_;
48 >        private Path resource_;
49          private File file_;
50          private File java_;
51          private ArrayList<DirSet> dirSets_ = new ArrayList<DirSet>();
# Line 95 | Line 95 | public class AAPTPackage extends Command
95                  publicDefinitions_ = publicDefinitions;
96          }
97  
98 <        public void setResource(File resource)
98 >        public void setResource(Path resource)
99          {
100                  resource_ = resource;
101          }
# Line 153 | Line 153 | public class AAPTPackage extends Command
153                          arguments("-P", publicDefinitions_);
154  
155                  if (resource_ != null)
156 <                        arguments("-S", resource_);
156 >                        for (String resource : resource_.list())
157 >                                arguments("-S", resource);
158  
159                  if (file_ != null)
160                          arguments("-F", file_);
# Line 191 | Line 192 | public class AAPTPackage extends Command
192                  }
193  
194                  if (resource_ != null)
195 <                {
195 <                        FileSet fileSet = (FileSet)project.createDataType("fileset");
196 <
197 <                        fileSet.setDir(resource_);
198 <                        union.add(fileSet);
199 <                }
195 >                        union.add(resource_);
196  
197                  union.addAll(dirSets_);
198  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines