litesoft
Diff Revisions
786
vs
787
for /trunk/Java/KeyHole/src/org/litesoft/aokeyhole/objects/SystemMetaData.java
|
@@ -5,6 +5,7 @@ |
5 |
5 |
|
|
6 |
6 |
|
import org.litesoft.aokeyhole.objects.factories.*; |
7 |
7 |
|
import org.litesoft.aokeyhole.objects.support.*; |
|
8 |
+ |
import org.litesoft.aokeyhole.persist.*; |
8 |
9 |
|
|
9 |
10 |
|
/** |
10 |
11 |
|
* Note all Systems are created in unpersist mode |
|
@@ -90,14 +91,11 @@ |
90 |
91 |
|
/** |
91 |
92 |
|
* Only the first one will be editable |
92 |
93 |
|
* |
93 |
|
- |
* @param pName Non-Null Name of the SubSystem |
94 |
|
- |
* @param pSource Used by the Persistence engine to resave from the original Source of the SubSystem |
95 |
|
- |
* |
96 |
94 |
|
* @return Never null. |
97 |
95 |
|
*/ |
98 |
|
- |
public SubSystemMetaData unpersistSubSystemMetaData( int pSortIndex, String pName, Object pSource ) |
|
96 |
+ |
public SubSystemMetaData unpersistSubSystemMetaData( int pSortIndex, SubSystemPersister pPersister ) |
99 |
97 |
|
{ |
100 |
|
- |
SubSystemMetaData md = mSubSystemFactory.createSubSystemMetaData( pSortIndex, pName, pSource, isEditable() && (0 == mOwnerManager.getOwnedCount()) ); |
|
98 |
+ |
SubSystemMetaData md = mSubSystemFactory.createSubSystemMetaData( pSortIndex, pPersister, isEditable() && (0 == mOwnerManager.getOwnedCount()) ); |
101 |
99 |
|
mOwnerManager.add( md ); |
102 |
100 |
|
if ( mPrimeSubSystemMetaData == null ) |
103 |
101 |
|
{ |
|
@@ -225,19 +223,6 @@ |
225 |
223 |
|
return (error != null) ? error : mOwnerManager.validatePersistable(); |
226 |
224 |
|
} |
227 |
225 |
|
|
228 |
|
- |
@Override |
229 |
|
- |
public void addLines( List<String> pCollector, int pIndent ) |
230 |
|
- |
{ |
231 |
|
- |
pCollector.add( startLine( pIndent++ ).toString() ); |
232 |
|
- |
|
233 |
|
- |
List<SubSystemMetaData> zSubSystems = new ArrayList<SubSystemMetaData>( getOwnerManager().getEntries() ); |
234 |
|
- |
Collections.sort( zSubSystems ); |
235 |
|
- |
for ( SubSystemMetaData zSubSystem : zSubSystems ) |
236 |
|
- |
{ |
237 |
|
- |
zSubSystem.addLines( pCollector, pIndent ); |
238 |
|
- |
} |
239 |
|
- |
} |
240 |
|
- |
|
241 |
226 |
|
protected class DeleteObject implements ChangeFragment |
242 |
227 |
|
{ |
243 |
228 |
|
private ObjectMetaData mToDelete; |