Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
B
BensikinArchivingGUI
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software Control System
Tango controls archiving
BensikinArchivingGUI
Commits
b8b0b037
Commit
b8b0b037
authored
Mar 22, 2012
by
Sylvain Mainguy
Browse files
Options
Downloads
Patches
Plain Diff
avisto: migrate from comete V1 to V2
parent
cb406977
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/java/fr/soleil/bensikin/components/StateViewer.java
+2
-3
2 additions, 3 deletions
src/main/java/fr/soleil/bensikin/components/StateViewer.java
with
2 additions
and
3 deletions
src/main/java/fr/soleil/bensikin/components/StateViewer.java
+
2
−
3
View file @
b8b0b037
...
@@ -27,7 +27,6 @@ import fr.soleil.comete.awt.util.ColorTool;
...
@@ -27,7 +27,6 @@ import fr.soleil.comete.awt.util.ColorTool;
import
fr.soleil.comete.definition.widget.util.CometeColor
;
import
fr.soleil.comete.definition.widget.util.CometeColor
;
import
fr.soleil.comete.tango.data.adapter.StateAdapter
;
import
fr.soleil.comete.tango.data.adapter.StateAdapter
;
public
class
StateViewer
extends
JLabel
{
public
class
StateViewer
extends
JLabel
{
private
static
final
long
serialVersionUID
=
7753625163588396224L
;
private
static
final
long
serialVersionUID
=
7753625163588396224L
;
...
@@ -37,11 +36,11 @@ public class StateViewer extends JLabel {
...
@@ -37,11 +36,11 @@ public class StateViewer extends JLabel {
this
.
setText
(
TangoConst
.
Tango_DevStateName
[
stateCode
]);
this
.
setText
(
TangoConst
.
Tango_DevStateName
[
stateCode
]);
this
.
setToolTipText
(
this
.
getText
());
this
.
setToolTipText
(
this
.
getText
());
Color
color
=
null
;
Color
color
=
null
;
CometeColor
cometeColor
=
null
;
// XXX en attendant correction dans TangoDAO
// XXX en attendant correction dans TangoDAO
// TODO avisto
// TODO avisto
MyStateAdapter
stateAdapter
=
new
MyStateAdapter
();
MyStateAdapter
stateAdapter
=
new
MyStateAdapter
();
cometeColor
=
stateAdapter
.
getColor
(
this
.
getText
());
CometeColor
cometeColor
=
stateAdapter
.
getColor
(
this
.
getText
());
if
(
cometeColor
!=
null
)
{
if
(
cometeColor
!=
null
)
{
color
=
ColorTool
.
getColor
(
cometeColor
);
color
=
ColorTool
.
getColor
(
cometeColor
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment