@@ -97,7 +97,8 @@ private static MappingVisitor createAdapter(String fromNs, String toNs, MappingA
97
97
new MappingDstNsReorder (
98
98
new FlatAsRegularMappingVisitor (new MappingAdapter (out )),
99
99
toNs ),
100
- fromNs );
100
+ fromNs ,
101
+ true );
101
102
}
102
103
103
104
private static final class MappingAdapter implements FlatMappingVisitor {
@@ -108,23 +109,23 @@ private static final class MappingAdapter implements FlatMappingVisitor {
108
109
@ Override
109
110
public boolean visitClass (String srcName , String [] dstNames ) throws IOException {
110
111
String dstName = dstNames [0 ];
111
- if (!bothNullOrEqual (srcName , dstName )) next .acceptClass (srcName , dstName );
112
+ if (!anyNullOrEqual (srcName , dstName )) next .acceptClass (srcName , dstName );
112
113
return true ;
113
114
}
114
115
115
116
@ Override
116
117
public boolean visitField (String srcClsName , String srcName , String srcDesc ,
117
118
String [] dstClsNames , String [] dstNames , String [] dstDescs ) throws IOException {
118
119
String dstName = dstNames [0 ];
119
- if (!bothNullOrEqual (srcName , dstName )) next .acceptField (new Member (srcClsName , srcName , srcDesc ), dstName );
120
+ if (!anyNullOrEqual (srcName , dstName )) next .acceptField (new Member (srcClsName , srcName , srcDesc ), dstName );
120
121
return false ;
121
122
}
122
123
123
124
@ Override
124
125
public boolean visitMethod (String srcClsName , String srcName , String srcDesc ,
125
126
String [] dstClsNames , String [] dstNames , String [] dstDescs ) throws IOException {
126
127
String dstName = dstNames [0 ];
127
- if (!bothNullOrEqual (srcName , dstName )) next .acceptMethod (new Member (srcClsName , srcName , srcDesc ), dstName );
128
+ if (!anyNullOrEqual (srcName , dstName )) next .acceptMethod (new Member (srcClsName , srcName , srcDesc ), dstName );
128
129
return true ;
129
130
}
130
131
@@ -164,7 +165,7 @@ private static boolean firstNullOrEqual(Object o1, Object o2) {
164
165
return o1 == null || o1 .equals (o2 );
165
166
}
166
167
167
- private static boolean bothNullOrEqual (Object o1 , Object o2 ) {
168
+ private static boolean anyNullOrEqual (Object o1 , Object o2 ) {
168
169
return o2 == null || firstNullOrEqual (o1 , o2 );
169
170
}
170
171
}
0 commit comments