Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
U
Uploader
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
5
Issues
5
List
Boards
Labels
Service Desk
Milestones
Merge Requests
2
Merge Requests
2
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Genesys PGR
Uploader
Commits
bd436488
Commit
bd436488
authored
Feb 10, 2020
by
Matija Obreza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix: Regexp matcher bug when replace text contains '$'
parent
ee8118de
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
anno-gui/src/main/java/org/genesys2/anno/converter/RowConverter.java
...c/main/java/org/genesys2/anno/converter/RowConverter.java
+2
-1
anno-gui/src/main/java/org/genesys2/anno/gui/PushDialog.java
anno-gui/src/main/java/org/genesys2/anno/gui/PushDialog.java
+5
-1
No files found.
anno-gui/src/main/java/org/genesys2/anno/converter/RowConverter.java
View file @
bd436488
...
...
@@ -173,7 +173,8 @@ public class RowConverter {
Matcher
replaceMat
=
REGEXP_REPLACE_PATTERN
.
matcher
(
groupPattern
);
while
(
replaceMat
.
find
())
{
int
group
=
Integer
.
parseInt
(
replaceMat
.
group
(
1
));
res
=
res
.
replaceAll
(
"\\$"
+
group
,
matcher
.
group
(
group
));
// StringUtils.replace() -- because of $ characters (problematic $1) replace text
res
=
StringUtils
.
replace
(
res
,
"$"
+
group
,
matcher
.
group
(
group
));
}
}
// System.err.println("Pattern=" + pattern + " groups=" +
...
...
anno-gui/src/main/java/org/genesys2/anno/gui/PushDialog.java
View file @
bd436488
...
...
@@ -640,7 +640,11 @@ public class PushDialog extends Dialog {
// Filter only for specific INSTCODES
final
Set
<
String
>
instCodesFilter
=
settings
.
getInstCodeSettings
().
getInstCodes
();
final
boolean
isBlackList
=
settings
.
getInstCodeSettings
().
isBlackList
();
_log
.
warn
(
"Running upload for "
+
instCodesFilter
.
toString
());
if
(
isBlackList
)
{
_log
.
warn
(
"Excluding upload for "
+
instCodesFilter
.
toString
());
}
else
{
_log
.
warn
(
"Running upload for "
+
instCodesFilter
.
toString
());
}
try
(
RowReader
rowReader
=
dataSourceLoader
.
createRowReader
(
dataSourceSheet
,
dataSource
))
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment