Skip to content

RTGOV-510 Renamed the 'Close' button and associated methods to 'Unassign... #209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
objectiser merged 1 commit into from
Sep 25, 2014
Merged

RTGOV-510 Renamed the 'Close' button and associated methods to 'Unassign... #209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...g/overlord/rtgov/analytics/situation/store/elasticsearch/ElasticsearchSituationStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,11 +260,11 @@ public void assignSituation(final String situationId, final String userName) {
/**
* {@inheritDoc}
*/
public void closeSituation(final String situationId) {
public void unassignSituation(final String situationId) {
Situation sit=getSituation(situationId);

if (sit != null) {
doCloseSituation(sit);
doUnassignSituation(sit);

// Save the updated situation
_client.update(situationId, ElasticsearchClient.convertTypeToJson(sit));
Expand Down
4 changes: 2 additions & 2 deletions ...erlord/rtgov/analytics/situation/store/elasticsearch/ElasticsearchSituationStoreTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -956,7 +956,7 @@ public void closeSituationAndRemoveAssignment() throws Exception {

assertEquals("junit",reload.getSituationProperties().get("assignedTo"));

_elasticsearchSituationStore.closeSituation(situation.getId());
_elasticsearchSituationStore.unassignSituation(situation.getId());

reload = _elasticsearchSituationStore.getSituation(situation.getId());

Expand Down Expand Up @@ -1014,7 +1014,7 @@ public void closeSituationResetOpenResolution() throws Exception {

assertEquals("junit",reload.getSituationProperties().get(SituationStore.ASSIGNED_TO_PROPERTY));

_elasticsearchSituationStore.closeSituation(situation.getId());
_elasticsearchSituationStore.unassignSituation(situation.getId());

reload = _elasticsearchSituationStore.getSituation(situation.getId());

Expand Down
4 changes: 2 additions & 2 deletions ...jpa/src/main/java/org/overlord/rtgov/analytics/situation/store/jpa/JPASituationStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,10 +232,10 @@ public Void perform(Session s) {
/**
* {@inheritDoc}
*/
public void closeSituation(final String situationId) {
public void unassignSituation(final String situationId) {
_jpaStore.withJpa(new JpaWork<Void>() {
public Void perform(Session s) {
doCloseSituation(loadSituation(s, situationId));
doUnassignSituation(loadSituation(s, situationId));
return null;
}
});
Expand Down
4 changes: 2 additions & 2 deletions ...src/test/java/org/overlord/rtgov/analytics/situation/store/jpa/JPASituationStoreTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ public void closeSituationAndRemoveAssignment() throws Exception {
_situationStore.assignSituation(situation.getId(), "junit");
Situation reload = _situationStore.getSituation(situation.getId());
assertEquals("junit",reload.getSituationProperties().get("assignedTo"));
_situationStore.closeSituation(situation.getId());
_situationStore.unassignSituation(situation.getId());
reload = _situationStore.getSituation(situation.getId());
assertFalse(reload.getSituationProperties().containsKey("assignedTo"));
}
Expand Down Expand Up @@ -312,7 +312,7 @@ public void closeSituationResetOpenResolution() throws Exception {
_situationStore.updateResolutionState(situation.getId(),IN_PROGRESS);
Situation reload = _situationStore.getSituation(situation.getId());
assertEquals("junit",reload.getSituationProperties().get(SituationStore.ASSIGNED_TO_PROPERTY));
_situationStore.closeSituation(situation.getId());
_situationStore.unassignSituation(situation.getId());
reload = _situationStore.getSituation(situation.getId());
assertFalse(reload.getSituationProperties().containsKey(SituationStore.RESOLUTION_STATE_PROPERTY));
assertFalse(reload.getSituationProperties().containsKey(SituationStore.ASSIGNED_TO_PROPERTY));
Expand Down
8 changes: 4 additions & 4 deletions ...re/src/main/java/org/overlord/rtgov/analytics/situation/store/AbstractSituationStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,16 +61,16 @@ protected void doAssignSituation(final Situation situation, final String userNam
/**
* {@inheritDoc}
*/
public void closeSituation(final String situationId) {
doCloseSituation(getSituation(situationId));
public void unassignSituation(final String situationId) {
doUnassignSituation(getSituation(situationId));
}

/**
* Close the situation.
* Unassign the situation.
*
* @param situationId Id
*/
protected void doCloseSituation(final Situation situation) {
protected void doUnassignSituation(final Situation situation) {
// RTGOV-499: Use deprecated method until no longer needing to support FSW6.0
java.util.Map<String, String> properties = situation.getProperties();
properties.remove(ASSIGNED_TO_PROPERTY);
Expand Down
6 changes: 3 additions & 3 deletions ...tion-store/src/main/java/org/overlord/rtgov/analytics/situation/store/SituationStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,12 @@ public interface SituationStore {
public void assignSituation(String situationId, String userName) throws Exception;

/**
* This method closes a situation.
* This method unassigns a situation.
*
* @param situationId The situation id
* @throws Exception Failed to close the situation
* @throws Exception Failed to unassign the situation
*/
public void closeSituation(String situationId) throws Exception;
public void unassignSituation(String situationId) throws Exception;

/**
* This method updates the resolution state of a situation.
Expand Down
14 changes: 7 additions & 7 deletions ...-ui-base/src/main/java/org/overlord/rtgov/ui/client/local/pages/SituationDetailsPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,8 @@ public class SituationDetailsPage extends AbstractPage {
InlineLabel resubmitDetails;
@Inject @DataField("btn-assign")
Button assignButton;
@Inject @DataField("btn-close")
Button closeButton;
@Inject @DataField("btn-unassign")
Button unassignButton;
@Inject @DataField("btn-start")
Button startButton;
@Inject @DataField("btn-stop")
Expand Down Expand Up @@ -229,7 +229,7 @@ protected void updateMetaData(SituationBean situation) {
} else {
assignButton.getElement().removeClassName("hide");
}
closeButton.getElement().removeClassName("hide"); //$NON-NLS-1$
unassignButton.getElement().removeClassName("hide"); //$NON-NLS-1$
ResolutionState resolutionState = ResolutionState.valueOf(situation.getResolutionState());
if (ResolutionState.UNRESOLVED == resolutionState
|| ResolutionState.WAITING == resolutionState
Expand All @@ -251,7 +251,7 @@ protected void updateMetaData(SituationBean situation) {
reopenButton.getElement().addClassName("hide");
}
} else {
closeButton.getElement().addClassName("hide");
unassignButton.getElement().addClassName("hide");
startButton.getElement().addClassName("hide");
reopenButton.getElement().addClassName("hide");
stopButton.getElement().addClassName("hide");
Expand Down Expand Up @@ -305,9 +305,9 @@ protected void onAssignButtonClick(ClickEvent event) {
loadSituationAndUpdatePageData();
}

@EventHandler("btn-close")
protected void onDeassignButtonClick(ClickEvent event) {
situationsService.close(id, voidInvocationHandler);
@EventHandler("btn-unassign")
protected void onUnassignButtonClick(ClickEvent event) {
situationsService.unassign(id, voidInvocationHandler);
loadSituationAndUpdatePageData();
}

Expand Down
6 changes: 3 additions & 3 deletions ...-base/src/main/java/org/overlord/rtgov/ui/client/local/services/SituationsRpcService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,13 +132,13 @@ public void assign(String situationId, IRpcServiceInvocationHandler<Void> handle
}

/**
* @see org.overlord.rtgov.ui.client.shared.services.ISituationsService#deassign(String)
* @see org.overlord.rtgov.ui.client.shared.services.ISituationsService#unassign(String)
*/
public void close(String situationId, IRpcServiceInvocationHandler<Void> handler) {
public void unassign(String situationId, IRpcServiceInvocationHandler<Void> handler) {
RemoteCallback<Void> successCallback = new DelegatingRemoteCallback<Void>(handler);
ErrorCallback<?> errorCallback = new DelegatingErrorCallback(handler);
try {
remoteSituationsService.call(successCallback, errorCallback).deassign(situationId);
remoteSituationsService.call(successCallback, errorCallback).unassign(situationId);
} catch (UiException e) {
errorCallback.error(null, e);
}
Expand Down
2 changes: 1 addition & 1 deletion ...rtgov-ui-base/src/main/java/org/overlord/rtgov/ui/client/local/site/situationDetails.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@
<div class="row-fluid">
<div class="span12">
<button data-field="btn-assign" class="btn" name="Assign" data-i18n-key="assign">Assign</button>
<button data-field="btn-close" class="btn" name="Close" data-i18n-key="close">Close</button>
<button data-field="btn-unassign" class="btn" name="Unassign" data-i18n-key="unassign">Unassign</button>
<button data-field="btn-reopen" class="btn" name="Reopen" data-i18n-key="reopen">Reopen</button>
<button data-field="btn-start" class="btn" name="Start" data-i18n-key="start">Start Progress</button>
<button data-field="btn-stop" class="btn" name="Stop" data-i18n-key="stop">Stop Progress</button>
Expand Down
2 changes: 1 addition & 1 deletion ...i-base/src/main/java/org/overlord/rtgov/ui/client/shared/services/ISituationsService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public interface ISituationsService {
* @param situationId
* @throws UiException
*/
public void deassign(String situationId) throws UiException;
public void unassign(String situationId) throws UiException;

/**
* Updates a situation with the given resolutionState.
Expand Down
2 changes: 1 addition & 1 deletion ...v-ui-base/src/main/java/org/overlord/rtgov/ui/server/services/ISituationsServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public SituationResultSetBean search(SituationsFilterBean filters, int page, Str
* @param situationId
* @throws UiException
*/
void close(String situationId) throws UiException;
void unassign(String situationId) throws UiException;

/**
* Updates a situation's resolutionState.
Expand Down
4 changes: 2 additions & 2 deletions ...-rtgov-ui-base/src/main/java/org/overlord/rtgov/ui/server/services/SituationsService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ public void assign(String situationId) throws UiException {
}

@Override
public void deassign(String situationId) throws UiException {
impl.close(situationId);
public void unassign(String situationId) throws UiException {
impl.unassign(situationId);
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions ...c/main/java/org/overlord/rtgov/ui/server/services/impl/SituationsProviderServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,8 @@ public void assign(String situationId, String userName) throws UiException {
}

@Override
public void close(String situationId) throws UiException {
_provider.close(situationId);
public void unassign(String situationId) throws UiException {
_provider.unassign(situationId);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion ...e/src/main/java/org/overlord/rtgov/ui/server/services/mock/MockSituationsServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ public void assign(String situationId, String userName) throws UiException {
}

@Override
public void close(String situationId) throws UiException {
public void unassign(String situationId) throws UiException {
SituationSummaryBean situationSummaryBean = idToSituation.get(situationId);
Map<String, String> properties = situationSummaryBean.getProperties();
properties.remove("assignedTo");
Expand Down
4 changes: 2 additions & 2 deletions ...w60/src/main/java/org/overlord/rtgov/analytics/situation/store/jpa/JPASituationStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,10 +232,10 @@ public Void perform(Session s) {
/**
* {@inheritDoc}
*/
public void closeSituation(final String situationId) {
public void unassignSituation(final String situationId) {
_jpaStore.withJpa(new JpaWork<Void>() {
public Void perform(Session s) {
doCloseSituation(loadSituation(s, situationId));
doUnassignSituation(loadSituation(s, situationId));
return null;
}
});
Expand Down
2 changes: 1 addition & 1 deletion ui/rtgov-ui-core/src/main/java/org/overlord/rtgov/ui/provider/SituationsProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ public interface SituationsProvider {

public void assign(final String situationId, final String userName) throws UiException;

public void close(final String situationId) throws UiException;
public void unassign(final String situationId) throws UiException;

public void updateResolutionState(final String situationId, final ResolutionState resolutionState)
throws UiException;
Expand Down
4 changes: 2 additions & 2 deletions ...ions/src/main/java/org/overlord/rtgov/ui/provider/situations/RTGovSituationsProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -691,9 +691,9 @@ public void assign(String situationId,String userName) throws UiException {
}

@Override
public void close(String situationId) throws UiException {
public void unassign(String situationId) throws UiException {
try {
_situationStore.closeSituation(situationId);
_situationStore.unassignSituation(situationId);
} catch (Exception e) {
throw new UiException(e);
}
Expand Down
4 changes: 2 additions & 2 deletions .../src/test/java/org/overlord/rtgov/ui/provider/situations/RTGovSituationsProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ public java.util.List<Situation> getSituations(SituationsQuery query) {
public void assignSituation(String situationId, String userName) throws Exception {
throw new Exception("Fail");
}
public void closeSituation(String situationId) throws Exception {
public void unassignSituation(String situationId) throws Exception {
throw new Exception("Fail");
}
public void updateResolutionState(String situationId, ResolutionState resolutionState) throws Exception {
Expand Down Expand Up @@ -268,7 +268,7 @@ public java.util.List<Situation> getSituations(SituationsQuery query) {
public void assignSituation(String situationId, String userName) throws Exception {
throw new Exception("Fail");
}
public void closeSituation(String situationId) throws Exception {
public void unassignSituation(String situationId) throws Exception {
throw new Exception("Fail");
}
public void updateResolutionState(String situationId, ResolutionState resolutionState) throws Exception {
Expand Down