Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
proview
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Esteban Blanc
proview
Commits
429e4476
Commit
429e4476
authored
Aug 19, 2010
by
Claes Sjofors
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Build error msg for java graph names starting with digit
parent
f768effb
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
36 additions
and
4 deletions
+36
-4
src/msg/ge/src/ge_msg.msg
src/msg/ge/src/ge_msg.msg
+1
-0
wb/lib/wb/src/wb_build.cpp
wb/lib/wb/src/wb_build.cpp
+20
-4
xtt/lib/ge/src/ge.cpp
xtt/lib/ge/src/ge.cpp
+10
-0
xtt/lib/ge/src/ge_graph_command.cpp
xtt/lib/ge/src/ge_graph_command.cpp
+5
-0
No files found.
src/msg/ge/src/ge_msg.msg
View file @
429e4476
...
@@ -50,6 +50,7 @@ no_propagate <Don't propagate event handling> /info
...
@@ -50,6 +50,7 @@ no_propagate <Don't propagate event handling> /info
isbaseclass <Is baseclass> /info
isbaseclass <Is baseclass> /info
fileopen <Unable to open file> /error
fileopen <Unable to open file> /error
needconv <Unable to save, graph needs conversion> /error
needconv <Unable to save, graph needs conversion> /error
javanamesyntax <Java name syntax error> /error
wb/lib/wb/src/wb_build.cpp
View file @
429e4476
...
@@ -705,12 +705,20 @@ void wb_build::xttgraph( pwr_tOid oid)
...
@@ -705,12 +705,20 @@ void wb_build::xttgraph( pwr_tOid oid)
else
{
else
{
Ge
*
gectx
=
m_wnav
->
ge_new
(
action
);
Ge
*
gectx
=
m_wnav
->
ge_new
(
action
);
strcpy
(
cmd
,
"export java"
);
strcpy
(
cmd
,
"export java"
);
gectx
->
command
(
cmd
);
m_sts
=
gectx
->
command
(
cmd
);
if
(
evenSts
())
{
msg_GetMsg
(
m_sts
,
cmd
,
sizeof
(
cmd
));
MsgWindow
::
message
(
'E'
,
cmd
,
msgw_ePop_Yes
,
oid
);
m_sts
=
PWRB__NOBUILT
;
delete
gectx
;
delete
gectx
;
return
;
}
sprintf
(
cmd
,
"Build: XttGraph Export java %s"
,
action
);
sprintf
(
cmd
,
"Build: XttGraph Export java %s"
,
action
);
MsgWindow
::
message
(
'I'
,
cmd
,
msgw_ePop_No
,
oid
);
MsgWindow
::
message
(
'I'
,
cmd
,
msgw_ePop_No
,
oid
);
delete
gectx
;
m_sts
=
PWRB__SUCCESS
;
m_sts
=
PWRB__SUCCESS
;
}
}
}
}
...
@@ -773,7 +781,8 @@ void wb_build::webgraph( pwr_tOid oid)
...
@@ -773,7 +781,8 @@ void wb_build::webgraph( pwr_tOid oid)
java_name
[
0
]
=
toupper
(
java_name
[
0
]);
java_name
[
0
]
=
toupper
(
java_name
[
0
]);
// Get the .pwg file for this javaname
// Get the .pwg file for this javaname
sprintf
(
name
,
"$pwrp_pop/%s.pwg"
,
cdh_Low
(
java_name
));
strcpy
(
graph_name
,
cdh_Low
(
java_name
));
sprintf
(
name
,
"$pwrp_pop/%s.pwg"
,
graph_name
);
dcli_translate_filename
(
name
,
name
);
dcli_translate_filename
(
name
,
name
);
m_sts
=
dcli_file_time
(
name
,
&
src_time
);
m_sts
=
dcli_file_time
(
name
,
&
src_time
);
...
@@ -826,7 +835,14 @@ void wb_build::webgraph( pwr_tOid oid)
...
@@ -826,7 +835,14 @@ void wb_build::webgraph( pwr_tOid oid)
else
{
else
{
Ge
*
gectx
=
m_wnav
->
ge_new
(
graph_name
);
Ge
*
gectx
=
m_wnav
->
ge_new
(
graph_name
);
strcpy
(
cmd
,
"export java"
);
strcpy
(
cmd
,
"export java"
);
gectx
->
command
(
cmd
);
m_sts
=
gectx
->
command
(
cmd
);
if
(
evenSts
())
{
msg_GetMsg
(
m_sts
,
cmd
,
sizeof
(
cmd
));
MsgWindow
::
message
(
'E'
,
cmd
,
msgw_ePop_Yes
,
oid
);
m_sts
=
PWRB__NOBUILT
;
delete
gectx
;
return
;
}
delete
gectx
;
delete
gectx
;
sprintf
(
cmd
,
"Build: WebGraph Export java %s"
,
java_name
);
sprintf
(
cmd
,
"Build: WebGraph Export java %s"
,
java_name
);
...
...
xtt/lib/ge/src/ge.cpp
View file @
429e4476
...
@@ -385,6 +385,11 @@ void Ge::export_javabean( Ge *gectx, char *name)
...
@@ -385,6 +385,11 @@ void Ge::export_javabean( Ge *gectx, char *name)
char
framename
[
80
];
char
framename
[
80
];
char
appletname
[
80
];
char
appletname
[
80
];
if
(
isdigit
(
name
[
0
]))
{
gectx
->
message
(
'E'
,
"Java name syntax error"
);
return
;
}
strcpy
(
framename
,
name
);
strcpy
(
framename
,
name
);
if
(
(
s
=
strrchr
(
framename
,
'.'
)))
if
(
(
s
=
strrchr
(
framename
,
'.'
)))
*
s
=
0
;
*
s
=
0
;
...
@@ -447,6 +452,11 @@ void Ge::export_gejava( Ge *gectx, char *name)
...
@@ -447,6 +452,11 @@ void Ge::export_gejava( Ge *gectx, char *name)
char
appletname
[
80
];
char
appletname
[
80
];
char
systemname
[
80
];
char
systemname
[
80
];
if
(
isdigit
(
name
[
0
]))
{
gectx
->
message
(
'E'
,
"Java name syntax error"
);
return
;
}
strcpy
(
framename
,
name
);
strcpy
(
framename
,
name
);
if
(
(
s
=
strrchr
(
framename
,
'.'
)))
if
(
(
s
=
strrchr
(
framename
,
'.'
)))
*
s
=
0
;
*
s
=
0
;
...
...
xtt/lib/ge/src/ge_graph_command.cpp
View file @
429e4476
...
@@ -1532,6 +1532,11 @@ static int graph_export_func( void *client_data,
...
@@ -1532,6 +1532,11 @@ static int graph_export_func( void *client_data,
}
}
}
}
if
(
isdigit
(
name
[
0
]))
{
graph
->
message
(
'E'
,
"Java name syntax error"
);
return
GE__JAVANAMESYNTAX
;
}
if
(
graph
->
is_subgraph
())
if
(
graph
->
is_subgraph
())
{
{
graph
->
message
(
'E'
,
"Unable to save subgraph as ge java"
);
graph
->
message
(
'E'
,
"Unable to save subgraph as ge java"
);
...
...
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