You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by sr...@apache.org on 2022/09/08 17:02:51 UTC
[plc4x] branch develop updated: fix(plc4go): use upstream version of tview again
This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
The following commit(s) were added to refs/heads/develop by this push:
new 454b053e6 fix(plc4go): use upstream version of tview again
454b053e6 is described below
commit 454b053e620f568fc301bc991d9e5a8a5b65d235
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Thu Sep 8 19:02:43 2022 +0200
fix(plc4go): use upstream version of tview again
---
plc4go/go.mod | 2 +-
plc4go/go.sum | 4 ++--
plc4go/tools/plc4xbrowser/ui/actions.go | 2 +-
plc4go/tools/plc4xbrowser/ui/commands.go | 2 +-
plc4go/tools/plc4xbrowser/ui/ui.go | 5 ++---
plc4go/tools/plc4xpcapanalyzer/ui/actions.go | 2 +-
plc4go/tools/plc4xpcapanalyzer/ui/commands.go | 2 +-
plc4go/tools/plc4xpcapanalyzer/ui/ui.go | 5 ++---
8 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/plc4go/go.mod b/plc4go/go.mod
index 6cfcdede4..aa906c9e6 100644
--- a/plc4go/go.mod
+++ b/plc4go/go.mod
@@ -32,12 +32,12 @@ require (
github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213
github.com/libp2p/go-reuseport v0.2.0
github.com/pkg/errors v0.9.1
+ github.com/rivo/tview v0.0.0-20220906194528-4664d8bf22d9
github.com/rs/zerolog v1.28.0
github.com/schollz/progressbar/v3 v3.10.1
github.com/snksoft/crc v1.1.0
github.com/spf13/cobra v1.5.0
github.com/spf13/viper v1.13.0
- github.com/sruehl/tview v0.0.0-20220805140909-9904944d3e75
github.com/stretchr/testify v1.8.0
github.com/subchen/go-xmldom v1.1.2
github.com/viney-shih/go-lock v1.1.2
diff --git a/plc4go/go.sum b/plc4go/go.sum
index eb9a66821..02006af6e 100644
--- a/plc4go/go.sum
+++ b/plc4go/go.sum
@@ -187,6 +187,8 @@ github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qR
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/rivo/tview v0.0.0-20220906194528-4664d8bf22d9 h1:/9fqJVVHxLYAqu+6aN4snnlxwyYi2u5NkrWS26WALlo=
+github.com/rivo/tview v0.0.0-20220906194528-4664d8bf22d9/go.mod h1:qNg8EdRsWg0Bxcj7npd4dSgxVbYB7kL7Mhk1YSOaVtw=
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
github.com/rivo/uniseg v0.3.4 h1:3Z3Eu6FGHZWSfNKJTOUiPatWwfc7DzJRU04jFUqJODw=
github.com/rivo/uniseg v0.3.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
@@ -212,8 +214,6 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
github.com/spf13/viper v1.13.0 h1:BWSJ/M+f+3nmdz9bxB+bWX28kkALN2ok11D0rSo8EJU=
github.com/spf13/viper v1.13.0/go.mod h1:Icm2xNL3/8uyh/wFuB1jI7TiTNKp8632Nwegu+zgdYw=
-github.com/sruehl/tview v0.0.0-20220805140909-9904944d3e75 h1:BKtJBki9pA52/f8D3HzBBuC5RPsE8OruGa4A6X0k0/8=
-github.com/sruehl/tview v0.0.0-20220805140909-9904944d3e75/go.mod h1:bDM4jV6fta45V303GZ1fyMBAsqYl/rjv0fosVbI/7T4=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
github.com/stretchr/testify v1.2.1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
diff --git a/plc4go/tools/plc4xbrowser/ui/actions.go b/plc4go/tools/plc4xbrowser/ui/actions.go
index 144201ff6..2b95285e0 100644
--- a/plc4go/tools/plc4xbrowser/ui/actions.go
+++ b/plc4go/tools/plc4xbrowser/ui/actions.go
@@ -28,9 +28,9 @@ import (
plc4go "github.com/apache/plc4x/plc4go/pkg/api"
"github.com/apache/plc4x/plc4go/pkg/api/transports"
"github.com/pkg/errors"
+ "github.com/rivo/tview"
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
- "github.com/sruehl/tview"
)
func InitSubsystem() {
diff --git a/plc4go/tools/plc4xbrowser/ui/commands.go b/plc4go/tools/plc4xbrowser/ui/commands.go
index f1875d926..5b31e2fa0 100644
--- a/plc4go/tools/plc4xbrowser/ui/commands.go
+++ b/plc4go/tools/plc4xbrowser/ui/commands.go
@@ -24,9 +24,9 @@ import (
plc4x_config "github.com/apache/plc4x/plc4go/pkg/api/config"
"github.com/apache/plc4x/plc4go/pkg/api/model"
"github.com/pkg/errors"
+ "github.com/rivo/tview"
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
- "github.com/sruehl/tview"
"net/url"
"strings"
"time"
diff --git a/plc4go/tools/plc4xbrowser/ui/ui.go b/plc4go/tools/plc4xbrowser/ui/ui.go
index fc53e0e6d..bbb6f3f64 100644
--- a/plc4go/tools/plc4xbrowser/ui/ui.go
+++ b/plc4go/tools/plc4xbrowser/ui/ui.go
@@ -25,7 +25,7 @@ import (
"github.com/apache/plc4x/plc4go/pkg/api/model"
"github.com/gdamore/tcell/v2"
"github.com/pkg/errors"
- "github.com/sruehl/tview"
+ "github.com/rivo/tview"
"regexp"
"strconv"
"time"
@@ -187,7 +187,6 @@ func buildCommandArea(newPrimitive func(text string) tview.Primitive, applicatio
enteredCommandsView.Highlight("0").ScrollToHighlight()
}
if len(currentSelection) == 1 {
- // TODO: currently this is broken due to https://github.com/rivo/tview/issues/751 (workaround active with sruehl fix fork)
commandInputField.SetText(enteredCommandsView.GetRegionText(currentSelection[0]))
application.SetFocus(commandInputField)
}
@@ -219,7 +218,7 @@ func buildOutputArea(newPrimitive func(text string) tview.Primitive, application
var jumpToMessageItem func(messageNumber int) bool
{
outputView := tview.NewTextView().
- SetDynamicColors(true). // TODO: currently this is broken due to https://github.com/rivo/tview/issues/751 (workaround active with sruehl fix fork)
+ SetDynamicColors(true).
SetRegions(true).
SetWordWrap(false).
SetWrap(false).
diff --git a/plc4go/tools/plc4xpcapanalyzer/ui/actions.go b/plc4go/tools/plc4xpcapanalyzer/ui/actions.go
index ccdd01192..6d70dd064 100644
--- a/plc4go/tools/plc4xpcapanalyzer/ui/actions.go
+++ b/plc4go/tools/plc4xpcapanalyzer/ui/actions.go
@@ -29,9 +29,9 @@ import (
"github.com/apache/plc4x/plc4go/spi"
"github.com/apache/plc4x/plc4go/spi/transports/pcap"
"github.com/pkg/errors"
+ "github.com/rivo/tview"
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
- "github.com/sruehl/tview"
"os"
"path"
"strings"
diff --git a/plc4go/tools/plc4xpcapanalyzer/ui/commands.go b/plc4go/tools/plc4xpcapanalyzer/ui/commands.go
index 1ed5c7415..84678de57 100644
--- a/plc4go/tools/plc4xpcapanalyzer/ui/commands.go
+++ b/plc4go/tools/plc4xpcapanalyzer/ui/commands.go
@@ -27,9 +27,9 @@ import (
"github.com/apache/plc4x/plc4go/tools/plc4xpcapanalyzer/internal/analyzer"
"github.com/apache/plc4x/plc4go/tools/plc4xpcapanalyzer/internal/extractor"
"github.com/pkg/errors"
+ "github.com/rivo/tview"
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
- "github.com/sruehl/tview"
"os"
"path"
"strings"
diff --git a/plc4go/tools/plc4xpcapanalyzer/ui/ui.go b/plc4go/tools/plc4xpcapanalyzer/ui/ui.go
index 1d15e97ba..9dc60b659 100644
--- a/plc4go/tools/plc4xpcapanalyzer/ui/ui.go
+++ b/plc4go/tools/plc4xpcapanalyzer/ui/ui.go
@@ -25,7 +25,7 @@ import (
"github.com/apache/plc4x/plc4go/spi"
"github.com/gdamore/tcell/v2"
"github.com/pkg/errors"
- "github.com/sruehl/tview"
+ "github.com/rivo/tview"
"regexp"
"strconv"
"time"
@@ -187,7 +187,6 @@ func buildCommandArea(newPrimitive func(text string) tview.Primitive, applicatio
enteredCommandsView.Highlight("0").ScrollToHighlight()
}
if len(currentSelection) == 1 {
- // TODO: currently this is broken due to https://github.com/rivo/tview/issues/751 (workaround active with sruehl fix fork)
commandInputField.SetText(enteredCommandsView.GetRegionText(currentSelection[0]))
application.SetFocus(commandInputField)
}
@@ -219,7 +218,7 @@ func buildOutputArea(newPrimitive func(text string) tview.Primitive, application
var jumpToMessageItem func(messageNumber int) bool
{
outputView := tview.NewTextView().
- SetDynamicColors(true). // TODO: currently this is broken due to https://github.com/rivo/tview/issues/751 (workaround active with sruehl fix fork)
+ SetDynamicColors(true).
SetRegions(true).
SetWordWrap(false).
SetWrap(false).