Skip to content

Commit

Permalink
MID-9278 small refactoring/cleanup after pre-merge review
Browse files Browse the repository at this point in the history
  • Loading branch information
@1azyman
1azyman committed Nov 30, 2023
1 parent 0f1d12c commit e824b14
Show file tree
Hide file tree
Showing 13 changed files with 55 additions and 55 deletions.
2 changes: 1 addition & 1 deletion .../src/main/java/com/evolveum/midpoint/gui/impl/factory/wrapper/ItemWrapperFactoryImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ boolean skipCreateWrapper(ItemDefinition<?> def, ItemStatus status, WrapperConte
}

protected boolean canCreateWrapper(ItemDefinition<?> def, ItemStatus status, WrapperContext context, boolean isEmptyValue) {
DisplayHint hint = def.getDisplay();
DisplayHint hint = def.getDisplayHint();
if (hint == DisplayHint.REGULAR) {
return true;
} else if (hint == DisplayHint.HIDDEN) {
Expand Down
4 changes: 2 additions & 2 deletions ...admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/wrapper/ItemWrapperImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -536,8 +536,8 @@ public boolean isElaborate() {
}

@Override
public DisplayHint getDisplay() {
return getItemDefinition().getDisplay();
public DisplayHint getDisplayHint() {
return getItemDefinition().getDisplayHint();
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions .../src/main/java/com/evolveum/midpoint/gui/impl/prism/wrapper/ValueMetadataWrapperImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@ public String getDeprecatedSince() {
}

@Override
public DisplayHint getDisplay() {
return metadataValueWrapper.getDisplay();
public DisplayHint getDisplayHint() {
return metadataValueWrapper.getDisplayHint();
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/com/evolveum/midpoint/schema/processor/AbstractResourceObjectDefinitionImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -657,7 +657,7 @@ public String getDeprecatedSince() {
}

@Override
public DisplayHint getDisplay() {
public DisplayHint getDisplayHint() {
return null;
}

Expand Down
4 changes: 2 additions & 2 deletions ...a/src/main/java/com/evolveum/midpoint/schema/processor/CompositeObjectDefinitionImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,8 @@ public List<SchemaMigration> getSchemaMigrations() {
public List<ItemDiagramSpecification> getDiagrams() { return structuralDefinition.getDiagrams(); }

@Override
public DisplayHint getDisplay() {
return structuralDefinition.getDisplay();
public DisplayHint getDisplayHint() {
return structuralDefinition.getDisplayHint();
}

@Override
Expand Down
8 changes: 4 additions & 4 deletions ...src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeDefinitionImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -372,11 +372,11 @@ public boolean isAlwaysUseForEquals() {
}

@Override
public DisplayHint getDisplay() {
if (customizationBean.getDisplay() != null) {
return MiscSchemaUtil.toDisplayHint(customizationBean.getDisplay());
public DisplayHint getDisplayHint() {
if (customizationBean.getDisplayHint() != null) {
return MiscSchemaUtil.toDisplayHint(customizationBean.getDisplayHint());
} else {
return rawDefinition.getDisplay();
return rawDefinition.getDisplayHint();
}
}

Expand Down
2 changes: 1 addition & 1 deletion ...c/main/java/com/evolveum/midpoint/schema/processor/ResourceObjectClassDefinitionImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ public void setExperimental(boolean experimental) {
}

@Override
public void setDisplay(DisplayHint display) {
public void setDisplayHint(DisplayHint displayHint) {
throw new UnsupportedOperationException();
}

Expand Down
12 changes: 6 additions & 6 deletions infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@
<xsd:appinfo>
<a:displayName>ObjectType.name</a:displayName>
<a:displayOrder>0</a:displayOrder>
<a:display>emphasized</a:display>
<a:displayHint>emphasized</a:displayHint>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand Down Expand Up @@ -2044,7 +2044,7 @@
<xsd:appinfo>
<a:displayName>UserType.fullName</a:displayName>
<a:displayOrder>100</a:displayOrder>
<a:display>emphasized</a:display>
<a:displayHint>emphasized</a:displayHint>
<a:diagram>
<a:name>user-overview</a:name>
<a:inclusion>include</a:inclusion>
Expand Down Expand Up @@ -2076,7 +2076,7 @@
<xsd:appinfo>
<a:displayName>UserType.givenName</a:displayName>
<a:displayOrder>110</a:displayOrder>
<a:display>emphasized</a:display>
<a:displayHint>emphasized</a:displayHint>
<a:diagram>
<a:name>user-overview</a:name>
<a:inclusion>include</a:inclusion>
Expand Down Expand Up @@ -2108,7 +2108,7 @@
<xsd:appinfo>
<a:displayName>UserType.familyName</a:displayName>
<a:displayOrder>120</a:displayOrder>
<a:display>emphasized</a:display>
<a:displayHint>emphasized</a:displayHint>
<a:diagram>
<a:name>user-overview</a:name>
<a:inclusion>include</a:inclusion>
Expand Down Expand Up @@ -4301,14 +4301,14 @@
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
<xsd:element name="display" type="tns:DisplayHintType" minOccurs="0">
<xsd:element name="displayHint" type="tns:DisplayHintType" minOccurs="0">
<xsd:annotation>
<xsd:documentation>
<!-- todo -->
</xsd:documentation>
<xsd:appinfo>
<a:since>4.9</a:since>
<a:displayName>ItemRefinedDefinitionType.display</a:displayName>
<a:displayName>ItemRefinedDefinitionType.displayHint</a:displayName>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand Down
14 changes: 7 additions & 7 deletions infra/schema/src/main/resources/xml/ns/public/common/common-provisioning-3.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
<xsd:appinfo>
<a:operational>true</a:operational>
<a:alwaysUseForEquals/>
<a:display>regular</a:display>
<a:displayHint>regular</a:displayHint>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand All @@ -100,7 +100,7 @@
</a:diagram>
<a:operational>true</a:operational>
<a:alwaysUseForEquals/>
<a:display>regular</a:display>
<a:displayHint>regular</a:displayHint>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand Down Expand Up @@ -2960,7 +2960,7 @@
<xsd:appinfo>
<a:operational>true</a:operational>
<a:alwaysUseForEquals/>
<a:display>regular</a:display>
<a:displayHint>regular</a:displayHint>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand Down Expand Up @@ -4322,7 +4322,7 @@
</xsd:documentation>
<xsd:appinfo>
<a:displayName>ShadowType.dead</a:displayName>
<a:display>emphasized</a:display>
<a:displayHint>emphasized</a:displayHint>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand Down Expand Up @@ -4370,7 +4370,7 @@
</xsd:documentation>
<xsd:appinfo>
<a:displayName>ShadowType.synchronizationSituation</a:displayName>
<a:display>emphasized</a:display>
<a:displayHint>emphasized</a:displayHint>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand Down Expand Up @@ -4440,7 +4440,7 @@
</xsd:documentation>
<xsd:appinfo>
<a:displayName>ShadowType.objectClass</a:displayName>
<a:display>emphasized</a:display>
<a:displayHint>emphasized</a:displayHint>
<a:diagram>
<a:name>user-shadow-resource</a:name>
</a:diagram>
Expand Down Expand Up @@ -4493,7 +4493,7 @@
</xsd:documentation>
<xsd:appinfo>
<a:displayName>ShadowType.intent</a:displayName>
<a:display>emphasized</a:display>
<a:displayHint>emphasized</a:displayHint>
<a:diagram>
<a:name>user-shadow-resource</a:name>
</a:diagram>
Expand Down
38 changes: 19 additions & 19 deletions infra/schema/src/main/resources/xml/ns/public/common/common-tasks-3.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@
</xsd:documentation>
<xsd:appinfo>
<a:operational>true</a:operational>
<a:display>regular</a:display>
<a:displayHint>regular</a:displayHint>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand All @@ -221,7 +221,7 @@
<xsd:appinfo>
<a:since>3.8</a:since>
<a:operational>true</a:operational>
<a:display>regular</a:display>
<a:displayHint>regular</a:displayHint>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand All @@ -234,7 +234,7 @@
<xsd:appinfo>
<a:since>4.3</a:since>
<a:operational>true</a:operational>
<a:display>regular</a:display>
<a:displayHint>regular</a:displayHint>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand All @@ -246,7 +246,7 @@
</xsd:documentation>
<xsd:appinfo>
<a:operational>true</a:operational>
<a:display>regular</a:display>
<a:displayHint>regular</a:displayHint>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand All @@ -261,7 +261,7 @@
<xsd:appinfo>
<a:displayName>TaskType.nodeAsObserved</a:displayName>
<a:operational>true</a:operational>
<a:display>regular</a:display>
<a:displayHint>regular</a:displayHint>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand Down Expand Up @@ -298,7 +298,7 @@
</xsd:documentation>
<xsd:appinfo>
<a:operational>true</a:operational>
<a:display>regular</a:display>
<a:displayHint>regular</a:displayHint>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand All @@ -311,7 +311,7 @@
<xsd:appinfo>
<a:displayName>TaskType.resultStatus</a:displayName>
<a:operational>true</a:operational>
<a:display>regular</a:display>
<a:displayHint>regular</a:displayHint>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand All @@ -334,7 +334,7 @@
</xsd:documentation>
<xsd:appinfo>
<a:operational>true</a:operational>
<a:display>regular</a:display>
<a:displayHint>regular</a:displayHint>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand All @@ -346,7 +346,7 @@
</xsd:documentation>
<xsd:appinfo>
<a:operational>true</a:operational>
<a:display>regular</a:display>
<a:displayHint>regular</a:displayHint>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand All @@ -359,7 +359,7 @@
</xsd:documentation>
<xsd:appinfo>
<a:operational>true</a:operational>
<a:display>regular</a:display>
<a:displayHint>regular</a:displayHint>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand All @@ -386,7 +386,7 @@
</xsd:documentation>
<xsd:appinfo>
<a:operational>true</a:operational>
<a:display>regular</a:display>
<a:displayHint>regular</a:displayHint>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand All @@ -402,7 +402,7 @@
<xsd:appinfo>
<a:since>3.5</a:since>
<a:operational>true</a:operational>
<a:display>regular</a:display>
<a:displayHint>regular</a:displayHint>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand All @@ -416,7 +416,7 @@
<xsd:appinfo>
<a:displayName>TaskType.progress</a:displayName>
<a:operational>true</a:operational>
<a:display>regular</a:display>
<a:displayHint>regular</a:displayHint>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand All @@ -427,7 +427,7 @@
</xsd:documentation>
<xsd:appinfo>
<a:operational>true</a:operational>
<a:display>regular</a:display>
<a:displayHint>regular</a:displayHint>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand All @@ -440,7 +440,7 @@
</xsd:documentation>
<xsd:appinfo>
<a:operational>true</a:operational>
<a:display>regular</a:display>
<a:displayHint>regular</a:displayHint>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand All @@ -461,7 +461,7 @@
<a:deprecated>true</a:deprecated>
<a:deprecatedSince>4.4</a:deprecatedSince>
<a:operational>true</a:operational>
<a:display>regular</a:display>
<a:displayHint>regular</a:displayHint>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand Down Expand Up @@ -540,7 +540,7 @@
<a:deprecatedSince>4.4</a:deprecatedSince>
<a:removedSince>4.8</a:removedSince>
<a:operational>true</a:operational>
<a:display>regular</a:display>
<a:displayHint>regular</a:displayHint>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand Down Expand Up @@ -631,7 +631,7 @@
<xsd:appinfo>
<a:since>3.8</a:since>
<a:operational>true</a:operational>
<a:display>regular</a:display>
<a:displayHint>regular</a:displayHint>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand All @@ -651,7 +651,7 @@
<xsd:appinfo>
<a:since>4.8</a:since>
<a:operational>true</a:operational>
<a:display>regular</a:display>
<a:displayHint>regular</a:displayHint>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand Down
2 changes: 1 addition & 1 deletion .../evolveum/midpoint/model/impl/schema/transform/PartiallyMutableComplexTypeDefinition.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ default void setExperimental(boolean experimental) {
}

@Override
default void setDisplay(DisplayHint display) {
default void setDisplayHint(DisplayHint displayHint) {
throw new IllegalStateException("ComplexTypeDefinition is not modifiable");
}

Expand Down

0 comments on commit e824b14

Please sign in to comment.