Skip to content

Commit

Permalink
Fixed formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
rkorytkowski committed Jul 11, 2013
1 parent 89f096c commit 50bc140
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 8 deletions.
2 changes: 1 addition & 1 deletion api/src/main/java/org/openmrs/Person.java
Expand Up @@ -835,7 +835,7 @@ public User getPersonChangedBy() {

public void setPersonChangedBy(User changedBy) {
this.personChangedBy = changedBy;
this.setChangedBy(changedBy);
this.setChangedBy(changedBy);
}

public Date getPersonDateChanged() {
Expand Down
4 changes: 2 additions & 2 deletions api/src/main/java/org/openmrs/api/context/ServiceContext.java
Expand Up @@ -819,8 +819,8 @@ public void setModuleService(List<Object> params) {
+ cls.getClass().getClassLoader().hashCode());
//pay attention that here, cls = Class.forName(classString), the system class loader and
//cls2 is the openmrs class loader, like above.
log.debug("cls==cls2: " + String.valueOf(cls ==
OpenmrsClassLoader.getInstance().loadClass(classString)));
log.debug("cls==cls2: "
+ String.valueOf(cls == OpenmrsClassLoader.getInstance().loadClass(classString)));
}
}
catch (Exception e) { /*pass*/}
Expand Down
4 changes: 3 additions & 1 deletion api/src/main/java/org/openmrs/util/OpenmrsConstants.java
Expand Up @@ -1077,6 +1077,7 @@ public static final Collection<String> AUTO_ROLES() {
public static final String GP_CASE_SENSITIVE_NAMES_IN_CONCEPT_NAME_TABLE = "concept.caseSensitiveNamesInConceptNameTable";

public static final String GP_MAIL_SMTP_STARTTLS_ENABLE = "mail.smtp.starttls.enable";

/**
* At OpenMRS startup these global properties/default values/descriptions are inserted into the
* database if they do not exist yet.
Expand Down Expand Up @@ -1155,7 +1156,8 @@ public static final List<GlobalProperty> CORE_GLOBAL_PROPERTIES() {
props.add(new GlobalProperty(GLOBAL_PROPERTY_LOCATION_WIDGET_TYPE, "default",
"Type of widget to use for location fields"));

props.add(new GlobalProperty(GP_MAIL_SMTP_STARTTLS_ENABLE, "false", "Set to true to enable TLS encryption, else set to false"));
props.add(new GlobalProperty(GP_MAIL_SMTP_STARTTLS_ENABLE, "false",
"Set to true to enable TLS encryption, else set to false"));

String standardRegimens = "<list>" + " <regimenSuggestion>" + " <drugComponents>" + " <drugSuggestion>"
+ " <drugId>2</drugId>" + " <dose>1</dose>" + " <units>tab(s)</units>"
Expand Down
Expand Up @@ -91,7 +91,7 @@
*/
@ContextConfiguration(locations = { "classpath:applicationContext-service.xml", "classpath*:openmrs-servlet.xml",
"classpath*:moduleApplicationContext.xml" })
@TestExecutionListeners({ TransactionalTestExecutionListener.class, SkipBaseSetupAnnotationExecutionListener.class,
@TestExecutionListeners( { TransactionalTestExecutionListener.class, SkipBaseSetupAnnotationExecutionListener.class,
StartModuleExecutionListener.class })
@Transactional
@TransactionConfiguration(defaultRollback = true)
Expand Down Expand Up @@ -269,8 +269,8 @@ public Properties getRuntimeProperties() {
tempappdir.mkdir(); // turn it into a directory
tempappdir.deleteOnExit(); // clean up when we're done with tests

runtimeProperties.setProperty(OpenmrsConstants.APPLICATION_DATA_DIRECTORY_RUNTIME_PROPERTY,
tempappdir.getAbsolutePath());
runtimeProperties.setProperty(OpenmrsConstants.APPLICATION_DATA_DIRECTORY_RUNTIME_PROPERTY, tempappdir
.getAbsolutePath());
OpenmrsConstants.APPLICATION_DATA_DIRECTORY = tempappdir.getAbsolutePath();
}
catch (IOException e) {
Expand Down Expand Up @@ -371,7 +371,7 @@ public static synchronized String[] askForUsernameAndPassword(String message) {
UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
}
catch (Exception e) {

}

if (message == null || "".equals(message))
Expand Down

0 comments on commit 50bc140

Please sign in to comment.