Skip to content

Commit

Permalink
BZ-1163854 - Social: 'commented' events bugged
Browse files Browse the repository at this point in the history
  • Loading branch information
@wmedvede
wmedvede committed Jan 26, 2015
1 parent 4dee8a5 commit 016698f
Show file tree
Hide file tree
Showing 11 changed files with 22 additions and 1 deletion.
3 changes: 2 additions & 1 deletion ...in/java/org/drools/workbench/screens/drltext/backend/server/DRLTextEditorServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,13 +190,14 @@ public Path save( final Path resource,
try {
final String drl = assertPackageName( content,
resource );

Metadata currentMetadata = metadataService.getMetadata( resource );
ioService.write( Paths.convert( resource ),
drl,
metadataService.setUpAttributes( resource,
metadata ),
makeCommentedOption( comment ) );

fireMetadataSocialEvents( resource, currentMetadata, metadata );
return resource;

} catch ( Exception e ) {
Expand Down
2 changes: 2 additions & 0 deletions ...in/java/org/drools/workbench/screens/dsltext/backend/server/DSLTextEditorServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ public Path save( final Path resource,
final Metadata metadata,
final String comment ) {
try {
Metadata currentMetadata = metadataService.getMetadata( resource );
ioService.write( Paths.convert( resource ),
content,
metadataService.setUpAttributes( resource,
Expand All @@ -142,6 +143,7 @@ public Path save( final Path resource,
//Invalidate Package-level DMO cache as a DSL has been altered
invalidateDMOPackageCache.fire( new InvalidateDMOPackageCacheEvent( resource ) );

fireMetadataSocialEvents( resource, currentMetadata, metadata );
return resource;

} catch ( Exception e ) {
Expand Down
2 changes: 2 additions & 0 deletions ...kend/src/main/java/org/drools/workbench/screens/enums/backend/server/EnumServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ public Path save( final Path resource,
final Metadata metadata,
final String comment ) {
try {
Metadata currentMetadata = metadataService.getMetadata( resource );
ioService.write( Paths.convert( resource ),
content,
metadataService.setUpAttributes( resource,
Expand All @@ -151,6 +152,7 @@ public Path save( final Path resource,
//Invalidate Package-level DMO cache as Enums have changed.
invalidateDMOPackageCache.fire( new InvalidateDMOPackageCacheEvent( resource ) );

fireMetadataSocialEvents( resource, currentMetadata, metadata );
return resource;

} catch ( Exception e ) {
Expand Down
2 changes: 2 additions & 0 deletions ...in/java/org/drools/workbench/screens/globals/backend/server/GlobalsEditorServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ public Path save( final Path resource,
final String packageName = ( pkg == null ? null : pkg.getPackageName() );
content.setPackageName( packageName );

Metadata currentMetadata = metadataService.getMetadata( resource );
ioService.write( Paths.convert( resource ),
GlobalsPersistence.getInstance().marshal( content ),
metadataService.setUpAttributes( resource,
Expand All @@ -168,6 +169,7 @@ public Path save( final Path resource,
//Invalidate Package-level DMO cache as Globals have changed.
invalidatePackageDMOEvent.fire( new InvalidateDMOPackageCacheEvent( resource ) );

fireMetadataSocialEvents( resource, currentMetadata, metadata );
return resource;

} catch ( Exception e ) {
Expand Down
2 changes: 2 additions & 0 deletions .../workbench/screens/guided/dtable/backend/server/GuidedDecisionTableEditorServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,12 +204,14 @@ public Path save( final Path resource,
final String packageName = ( pkg == null ? null : pkg.getPackageName() );
model.setPackageName( packageName );

Metadata currentMetadata = metadataService.getMetadata( resource );
ioService.write( Paths.convert( resource ),
GuidedDTXMLPersistence.getInstance().marshal( model ),
metadataService.setUpAttributes( resource,
metadata ),
makeCommentedOption( comment ) );

fireMetadataSocialEvents( resource, currentMetadata, metadata );
return resource;

} catch ( Exception e ) {
Expand Down
2 changes: 2 additions & 0 deletions ...ls/workbench/screens/guided/dtree/backend/server/GuidedDecisionTreeEditorServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,12 +207,14 @@ public Path save( final Path resource,
final String packageName = ( pkg == null ? null : pkg.getPackageName() );
model.setPackageName( packageName );

Metadata currentMetadata = metadataService.getMetadata( resource );
ioService.write( Paths.convert( resource ),
GuidedDecisionTreeDRLPersistence.getInstance().marshal( model ),
metadataService.setUpAttributes( resource,
metadata ),
makeCommentedOption( comment ) );

fireMetadataSocialEvents( resource, currentMetadata, metadata );
return resource;

} catch ( Exception e ) {
Expand Down
2 changes: 2 additions & 0 deletions .../org/drools/workbench/screens/guided/rule/backend/server/GuidedRuleEditorServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,13 +206,15 @@ public Path save( final Path resource,
final String packageName = ( pkg == null ? null : pkg.getPackageName() );
model.setPackageName( packageName );

Metadata currentMetadata = metadataService.getMetadata( resource );
ioService.write( Paths.convert( resource ),
toSourceUnexpanded( resource,
model ),
metadataService.setUpAttributes( resource,
metadata ),
makeCommentedOption( comment ) );

fireMetadataSocialEvents( resource, currentMetadata, metadata );
return resource;

} catch ( Exception e ) {
Expand Down
2 changes: 2 additions & 0 deletions ...s/workbench/screens/guided/scorecard/backend/server/GuidedScoreCardEditorServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,11 +149,13 @@ public Path save( final Path resource,
final String packageName = ( pkg == null ? null : pkg.getPackageName() );
model.setPackageName( packageName );

Metadata currentMetadata = metadataService.getMetadata( resource );
ioService.write( Paths.convert( resource ),
GuidedScoreCardXMLPersistence.getInstance().marshal( model ),
metadataService.setUpAttributes( resource, metadata ),
makeCommentedOption( comment ) );

fireMetadataSocialEvents( resource, currentMetadata, metadata );
return resource;

} catch ( Exception e ) {
Expand Down
2 changes: 2 additions & 0 deletions .../drools/workbench/screens/guided/template/server/GuidedRuleTemplateEditorServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,11 +180,13 @@ public Path save( final Path resource,
final String packageName = ( pkg == null ? null : pkg.getPackageName() );
model.setPackageName( packageName );

Metadata currentMetadata = metadataService.getMetadata( resource );
ioService.write( Paths.convert( resource ),
RuleTemplateModelXMLPersistenceImpl.getInstance().marshal( model ),
metadataService.setUpAttributes( resource, metadata ),
makeCommentedOption( comment ) );

fireMetadataSocialEvents( resource, currentMetadata, metadata );
return resource;

} catch ( Exception e ) {
Expand Down
2 changes: 2 additions & 0 deletions ...g/drools/workbench/screens/testscenario/backend/server/ScenarioTestEditorServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,12 +144,14 @@ public Path save( final Path resource,
final Metadata metadata,
final String comment ) {
try {
Metadata currentMetadata = metadataService.getMetadata( resource );
ioService.write( Paths.convert( resource ),
ScenarioXMLPersistence.getInstance().marshal( content ),
metadataService.setUpAttributes( resource,
metadata ),
makeCommentedOption( comment ) );

fireMetadataSocialEvents( resource, currentMetadata, metadata );
return resource;

} catch ( Exception e ) {
Expand Down
2 changes: 2 additions & 0 deletions ...ava/org/drools/workbench/screens/workitems/backend/server/WorkItemsEditorServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,12 +227,14 @@ public Path save( final Path resource,
final Metadata metadata,
final String comment ) {
try {
Metadata currentMetadata = metadataService.getMetadata( resource );
ioService.write( Paths.convert( resource ),
content,
metadataService.setUpAttributes( resource,
metadata ),
makeCommentedOption( comment ) );

fireMetadataSocialEvents( resource, currentMetadata, metadata );
return resource;

} catch ( Exception e ) {
Expand Down

0 comments on commit 016698f

Please sign in to comment.