Skip to content

Commit

Permalink
BZ-983536 - default kbase and non default ksession combination is not…
Browse files Browse the repository at this point in the history
… included in kmodule.xml in resulting jar.

-Default KBase should not be forced.

(cherry picked from commit 3276d04)
  • Loading branch information
Rikkola committed Nov 14, 2013
1 parent ed3c31d commit 3537e1e
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 153 deletions.
Expand Up @@ -31,7 +31,6 @@
import org.jboss.errai.common.client.api.Caller;
import org.jboss.errai.common.client.api.RemoteCallback;
import org.kie.workbench.common.screens.projecteditor.client.resources.ProjectEditorResources;
import org.kie.workbench.common.screens.projecteditor.client.validation.KModuleValidator;
import org.kie.workbench.common.screens.projecteditor.model.ProjectScreenModel;
import org.kie.workbench.common.screens.projecteditor.service.ProjectScreenService;
import org.kie.workbench.common.widgets.client.callbacks.HasBusyIndicatorDefaultErrorCallback;
Expand Down Expand Up @@ -315,26 +314,19 @@ public void callback( Void v ) {
};
}

private void saveProject( final RemoteCallback callback ) {
KModuleValidator kModuleValidator = new KModuleValidator( ProjectEditorResources.CONSTANTS );
kModuleValidator.validate( model.getKModule() );

if ( !kModuleValidator.hasErrors() ) {
saveOperationService.save( pathToPomXML,
new CommandWithCommitMessage() {
@Override
public void execute( final String comment ) {
private void saveProject(final RemoteCallback callback) {
saveOperationService.save(pathToPomXML,
new CommandWithCommitMessage() {
@Override
public void execute(final String comment) {

view.showBusyIndicator( CommonConstants.INSTANCE.Saving() );
view.showBusyIndicator(CommonConstants.INSTANCE.Saving());

projectScreenService.call( callback,
new HasBusyIndicatorDefaultErrorCallback( view ) ).save( pathToPomXML, model, comment );
projectScreenService.call(callback,
new HasBusyIndicatorDefaultErrorCallback(view)).save(pathToPomXML, model, comment);

}
} );
} else {
ErrorPopup.showMessage( kModuleValidator.getErrorsString() );
}
}
});
}

private RemoteCallback getBuildSuccessCallback() {
Expand Down
Expand Up @@ -196,8 +196,6 @@ public interface ProjectEditorConstants

String NewProjectWizard();

String AKModuleMustHaveAtLeastOneDefaultKBasePleaseAddOne();

String IncludedKnowledgeBases();

String Stateful();
Expand Down

This file was deleted.

Expand Up @@ -103,7 +103,6 @@ KnowledgeBasesAndSessions=Knowledge bases and sessions
BracketDefaultBracket=(default)
Packages=Packages
NewProjectWizard=New Project Wizard
AKModuleMustHaveAtLeastOneDefaultKBasePleaseAddOne=A KModule must have at least one default KBase. Please add one.
IncludedKnowledgeBases=Included Knowledge Bases
Stateful=Stateful
Stateless=Stateless
Expand Down

This file was deleted.

0 comments on commit 3537e1e

Please sign in to comment.